From 08c68708ed14fc03e75873b2fa985ebbc7a301c3 Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Mon, 11 May 2020 21:20:54 +0200 Subject: [PATCH] Update installers --- README.md | 47 +++++++++++++++++++-------------- create_linux_installers.sh | 16 +++++++++-- create_linux_installers_test.sh | 16 +++++++++-- 3 files changed, 55 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index b8e3689..be55ff6 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,7 @@ The addon and system tray application can do: - show / hide Thunderbird (minimize) - minimizing hides to tray - minimize on startup - -The default poll time is 60 seconds. You change the timing in the preferences but be aware that a too short poll time can lead to a high CPU load. +- minimize on close @@ -31,10 +30,11 @@ These packages will install the Thunderbird addon and companion app system wide. Root credentials are required. ### openSuSE -#### Leap 15.1 + +#### Tumbleweed ```bash -sudo zypper ar -f https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/openSUSE_Leap_15.1/ SysTray-X +sudo zypper ar -f https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/openSUSE_Tumbleweed/ SysTray-X sudo zypper in systray-x ``` @@ -45,22 +45,39 @@ sudo zypper ar -f https://download.opensuse.org/repositories/home:/Ximi1970:/Moz sudo zypper in systray-x ``` -#### Tumbleweed +#### Leap 15.1 ```bash -sudo zypper ar -f https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/openSUSE_Tumbleweed/ SysTray-X +sudo zypper ar -f https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/openSUSE_Leap_15.1/ SysTray-X sudo zypper in systray-x ``` -#### SLE 15 +#### SLE 15 SP1 ```bash sudo zypper ar -f https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/openSUSE_SLE_15_SP1/ SysTray-X sudo zypper in systray-x ``` +#### SLE 15 + +```bash +sudo zypper ar -f https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/openSUSE_SLE_15/ SysTray-X +sudo zypper in systray-x +``` + ### xUbuntu +#### 20.04 LTS + +```bash +wget -q https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/xUbuntu_20.04/Release.key +sudo apt-key add Release.key +sudo bash -c 'echo "deb https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/xUbuntu_20.04 ./" > /etc/apt/sources.list.d/systray-x.list' +sudo apt update +sudo apt install systray-x +``` + #### 19.10 ```bash @@ -71,16 +88,6 @@ sudo apt update sudo apt install systray-x ``` -#### 16.04 LTS - -```bash -wget -q https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/xUbuntu_16.04/Release.key -sudo apt-key add Release.key -sudo bash -c 'echo "deb https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/xUbuntu_16.04 ./" > /etc/apt/sources.list.d/systray-x.list' -sudo apt update -sudo apt install systray-x -``` - #### 18.04 LTS ```bash @@ -91,12 +98,12 @@ sudo apt update sudo apt install systray-x ``` -#### 20.04 LTS +#### 16.04 LTS ```bash -wget -q https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/xUbuntu_20.04/Release.key +wget -q https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/xUbuntu_16.04/Release.key sudo apt-key add Release.key -sudo bash -c 'echo "deb https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/xUbuntu_20.04 ./" > /etc/apt/sources.list.d/systray-x.list' +sudo bash -c 'echo "deb https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/xUbuntu_16.04 ./" > /etc/apt/sources.list.d/systray-x.list' sudo apt update sudo apt install systray-x ``` diff --git a/create_linux_installers.sh b/create_linux_installers.sh index a945725..4e98b4a 100755 --- a/create_linux_installers.sh +++ b/create_linux_installers.sh @@ -131,10 +131,12 @@ create_rpm_tar() { # # Find rpm # - local RPM_FILE=$(grep ">systray-x-[^d].*<" index.html | sed -e "s/.*>\(systray-x-[^d].*rpm\)<.*/\1/") + local RPM_FILE=$(grep ">systray-x-[^dg].*<" index.html | sed -e "s/.*>\(systray-x-[^d].*rpm\)<.*/\1/") + local RPM_GNOME_FILE=$(grep ">systray-x-gnome-[^d].*<" index.html | sed -e "s/.*>\(systray-x-gnome-[^d].*rpm\)<.*/\1/") rm -f index.html echo "Found: "${RPM_FILE} + echo "Found: "${RPM_GNOME_FILE} FOUND_VERSION=$(echo ${RPM_FILE} | sed -e "s/systray-x-\(.*\)-.*/\1/") @@ -162,6 +164,7 @@ create_rpm_tar() { # Get the SysTray-X rpm # wget -q "${REPO_BASE}/${REPO_DISTR}/${REPO_ARCH}/${RPM_FILE}" + wget -q "${REPO_BASE}/${REPO_DISTR}/${REPO_ARCH}/${RPM_GNOME_FILE}" # # Get compression type @@ -223,6 +226,9 @@ create_rpm_tar() { if [ "${RPM_NAME_EXT}" != "_" ] ; then NEW_RPM_FILE=`echo ${RPM_FILE} | sed -s "s/\(systray-x-${FOUND_VERSION}-\)\(.*\)/\1${RPM_NAME_EXT}\.\2/"` mv -f ${RPM_FILE} $NEW_RPM_FILE + + NEW_RPM_GNOME_FILE=`echo ${RPM_GNOME_FILE} | sed -s "s/\(systray-x-gnome-${FOUND_VERSION}-\)\(.*\)/\1${RPM_NAME_EXT}\.\2/"` + mv -f ${RPM_GNOME_FILE} $NEW_RPM_GNOME_FILE fi # @@ -251,14 +257,16 @@ create_deb_tar() { # rm -f index.html wget -q "${REPO_BASE}/${REPO_DISTR}/${REPO_ARCH}/" - + # # Find deb # local DEB_FILE=$(grep ">systray-x_.*\.deb<" index.html | sed -e "s/.*>\(systray-x.*deb\)<.*/\1/") + local DEB_GNOME_FILE=$(grep ">systray-x-gnome_.*\.deb<" index.html | sed -e "s/.*>\(systray-x-gnome.*deb\)<.*/\1/") rm -f index.html echo "Found: "${DEB_FILE} + echo "Found: "${DEB_GNOME_FILE} FOUND_VERSION=$(echo ${DEB_FILE} | sed -e "s/systray-x_\(.*\)_.*/\1/") @@ -286,6 +294,7 @@ create_deb_tar() { # Get the SysTray-X deb # wget -q "${REPO_BASE}/${REPO_DISTR}/${REPO_ARCH}/${DEB_FILE}" + wget -q "${REPO_BASE}/${REPO_DISTR}/${REPO_ARCH}/${DEB_GNOME_FILE}" # # Extract @@ -315,6 +324,9 @@ create_deb_tar() { if [ "${DEB_NAME_EXT}" != "_" ] ; then NEW_DEB_FILE=`echo ${DEB_FILE} | sed -s "s/\(systray-x\_${FOUND_VERSION}\_\)\(.*\)/\1${DEB_NAME_EXT}\_\2/"` mv -f ${DEB_FILE} ${NEW_DEB_FILE} + + NEW_DEB_GNOME_FILE=`echo ${DEB_GNOME_FILE} | sed -s "s/\(systray-x-gnome\_${FOUND_VERSION}\_\)\(.*\)/\1${DEB_NAME_EXT}\_\2/"` + mv -f ${DEB_GNOME_FILE} ${NEW_DEB_GNOME_FILE} fi # diff --git a/create_linux_installers_test.sh b/create_linux_installers_test.sh index 77a1aab..3062481 100755 --- a/create_linux_installers_test.sh +++ b/create_linux_installers_test.sh @@ -131,10 +131,12 @@ create_rpm_tar() { # # Find rpm # - local RPM_FILE=$(grep ">systray-x-[^d].*<" index.html | sed -e "s/.*>\(systray-x-[^d].*rpm\)<.*/\1/") + local RPM_FILE=$(grep ">systray-x-[^dg].*<" index.html | sed -e "s/.*>\(systray-x-[^d].*rpm\)<.*/\1/") + local RPM_GNOME_FILE=$(grep ">systray-x-gnome-[^d].*<" index.html | sed -e "s/.*>\(systray-x-gnome-[^d].*rpm\)<.*/\1/") rm -f index.html echo "Found: "${RPM_FILE} + echo "Found: "${RPM_GNOME_FILE} FOUND_VERSION=$(echo ${RPM_FILE} | sed -e "s/systray-x-\(.*\)-.*/\1/") @@ -162,6 +164,7 @@ create_rpm_tar() { # Get the SysTray-X rpm # wget -q "${REPO_BASE}/${REPO_DISTR}/${REPO_ARCH}/${RPM_FILE}" + wget -q "${REPO_BASE}/${REPO_DISTR}/${REPO_ARCH}/${RPM_GNOME_FILE}" # # Get compression type @@ -223,6 +226,9 @@ create_rpm_tar() { if [ "${RPM_NAME_EXT}" != "_" ] ; then NEW_RPM_FILE=`echo ${RPM_FILE} | sed -s "s/\(systray-x-${FOUND_VERSION}-\)\(.*\)/\1${RPM_NAME_EXT}\.\2/"` mv -f ${RPM_FILE} $NEW_RPM_FILE + + NEW_RPM_GNOME_FILE=`echo ${RPM_GNOME_FILE} | sed -s "s/\(systray-x-gnome-${FOUND_VERSION}-\)\(.*\)/\1${RPM_NAME_EXT}\.\2/"` + mv -f ${RPM_GNOME_FILE} $NEW_RPM_GNOME_FILE fi # @@ -251,14 +257,16 @@ create_deb_tar() { # rm -f index.html wget -q "${REPO_BASE}/${REPO_DISTR}/${REPO_ARCH}/" - + # # Find deb # local DEB_FILE=$(grep ">systray-x_.*\.deb<" index.html | sed -e "s/.*>\(systray-x.*deb\)<.*/\1/") + local DEB_GNOME_FILE=$(grep ">systray-x-gnome_.*\.deb<" index.html | sed -e "s/.*>\(systray-x-gnome.*deb\)<.*/\1/") rm -f index.html echo "Found: "${DEB_FILE} + echo "Found: "${DEB_GNOME_FILE} FOUND_VERSION=$(echo ${DEB_FILE} | sed -e "s/systray-x_\(.*\)_.*/\1/") @@ -286,6 +294,7 @@ create_deb_tar() { # Get the SysTray-X deb # wget -q "${REPO_BASE}/${REPO_DISTR}/${REPO_ARCH}/${DEB_FILE}" + wget -q "${REPO_BASE}/${REPO_DISTR}/${REPO_ARCH}/${DEB_GNOME_FILE}" # # Extract @@ -315,6 +324,9 @@ create_deb_tar() { if [ "${DEB_NAME_EXT}" != "_" ] ; then NEW_DEB_FILE=`echo ${DEB_FILE} | sed -s "s/\(systray-x\_${FOUND_VERSION}\_\)\(.*\)/\1${DEB_NAME_EXT}\_\2/"` mv -f ${DEB_FILE} ${NEW_DEB_FILE} + + NEW_DEB_GNOME_FILE=`echo ${DEB_GNOME_FILE} | sed -s "s/\(systray-x-gnome\_${FOUND_VERSION}\_\)\(.*\)/\1${DEB_NAME_EXT}\_\2/"` + mv -f ${DEB_GNOME_FILE} ${NEW_DEB_GNOME_FILE} fi #