diff --git a/create_linux_installers.sh b/create_linux_installers.sh index 2eaec30..3870092 100755 --- a/create_linux_installers.sh +++ b/create_linux_installers.sh @@ -19,9 +19,15 @@ OBS_RPM_ARCHS+="SLE_15/x86_64 " OBS_RPM_PKS+="sle150 " OBS_RPM_ARCHS+="SLE_15_SP1/x86_64 " OBS_RPM_PKS+="sle151 " +OBS_RPM_ARCHS+="Fedora_31/x86_64 " +OBS_RPM_PKS+="fed31 " OBS_DEB_ARCHS="" OBS_DEB_PKS="" +OBS_DEB_ARCHS+="Debian_10/i386 " +OBS_DEB_PKS+="deb10 " +OBS_DEB_ARCHS+="Debian_10/amd64 " +OBS_DEB_PKS+="deb10 " OBS_DEB_ARCHS+="xUbuntu_18.04/i386 " OBS_DEB_PKS+="bionic1804 " OBS_DEB_ARCHS+="xUbuntu_18.04/amd64 " @@ -50,7 +56,7 @@ for rpmdir in $OBS_RPM_ARCHS ; do # # Find rpm # - RPM_FILE=`grep ">systray.*<" index.html | sed -e "s/.*>\(systray-x.*rpm\)<.*/\1/"` + RPM_FILE=`grep ">systray-x-[^d].*<" index.html | sed -e "s/.*>\(systray-x-[^d].*rpm\)<.*/\1/"` rm -f index.html echo $rpmdir/$RPM_FILE @@ -121,6 +127,17 @@ for rpmdir in $OBS_RPM_ARCHS ; do # Create installer # cp -f ../dist/install.sh SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh + + # + # Insert gnome setup + # + DISTRO=`echo $rpmdir | cut -d'/' -f1` + sed -i -e "/__GNOME_SETUP__/r../dist/install.$DISTRO.sh" SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh + sed -i -e "s/__GNOME_SETUP__//" SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh + + # + # Insert install tar + # cat $PACKAGE_NAME.tar.xz >> SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh chmod 755 SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh @@ -215,6 +232,17 @@ for debdir in $OBS_DEB_ARCHS ; do # Create installer # cp -f ../dist/install.sh SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh + + # + # Insert gnome setup + # + DISTRO=`echo $rpmdir | cut -d'/' -f1` + sed -i -e "/__GNOME_SETUP__/r../dist/install.$DISTRO.sh" SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh + sed -i -e "s/__GNOME_SETUP__//" SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh + + # + # Insert install tar + # cat $PACKAGE_NAME.tar.xz >> SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh chmod 755 SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh diff --git a/create_linux_installers_test.sh b/create_linux_installers_test.sh index 9c597a8..4ed2a67 100755 --- a/create_linux_installers_test.sh +++ b/create_linux_installers_test.sh @@ -5,8 +5,10 @@ VERSION="0~git.*" OBS_BASE="https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons:/Staging:/Test" OBS_PACKAGE="systray-x" -OBS_RPM_ARCHS="openSUSE_Leap_15.1/x86_64 " -OBS_RPM_PKS="_ " +OBS_RPM_ARCHS="" +OBS_RPM_PKS="" +OBS_RPM_ARCHS+="openSUSE_Leap_15.1/x86_64 " +OBS_RPM_PKS+="_ " OBS_RPM_ARCHS+="openSUSE_Leap_15.2/x86_64 " OBS_RPM_PKS+="_ " OBS_RPM_ARCHS+="openSUSE_Tumbleweed/i586 " @@ -17,9 +19,14 @@ OBS_RPM_ARCHS+="SLE_15/x86_64 " OBS_RPM_PKS+="sle150 " OBS_RPM_ARCHS+="SLE_15_SP1/x86_64 " OBS_RPM_PKS+="sle151 " +OBS_RPM_ARCHS+="Fedora_31/x86_64 " +OBS_RPM_PKS+="fed31 " -OBS_DEB_ARCHS="Debian_10/i386 " -OBS_DEB_PKS="deb10 " + +OBS_DEB_ARCHS="" +OBS_DEB_PKS="" +OBS_DEB_ARCHS+="Debian_10/i386 " +OBS_DEB_PKS+="deb10 " OBS_DEB_ARCHS+="Debian_10/amd64 " OBS_DEB_PKS+="deb10 " OBS_DEB_ARCHS+="xUbuntu_18.04/i386 " @@ -50,7 +57,7 @@ for rpmdir in $OBS_RPM_ARCHS ; do # # Find rpm # - RPM_FILE=`grep ">systray.*<" index.html | sed -e "s/.*>\(systray-x.*rpm\)<.*/\1/"` + RPM_FILE=`grep ">systray-x-[^d].*<" index.html | sed -e "s/.*>\(systray-x-[^d].*rpm\)<.*/\1/"` rm -f index.html echo $rpmdir/$RPM_FILE @@ -117,6 +124,17 @@ for rpmdir in $OBS_RPM_ARCHS ; do # Create installer # cp -f ../dist/install.sh SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh + + # + # Insert gnome setup + # + DISTRO=`echo $rpmdir | cut -d'/' -f1` + sed -i -e "/__GNOME_SETUP__/r../dist/install.$DISTRO.sh" SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh + sed -i -e "s/__GNOME_SETUP__//" SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh + + # + # Insert install tar + # cat $PACKAGE_NAME.tar.xz >> SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh chmod 755 SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh @@ -132,7 +150,6 @@ for rpmdir in $OBS_RPM_ARCHS ; do INDEX=$((INDEX+1)) done - # # Create bash installers for DEB based distributions # @@ -211,6 +228,17 @@ for debdir in $OBS_DEB_ARCHS ; do # Create installer # cp -f ../dist/install.sh SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh + + # + # Insert gnome setup + # + DISTRO=`echo $rpmdir | cut -d'/' -f1` + sed -i -e "/__GNOME_SETUP__/r../dist/install.$DISTRO.sh" SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh + sed -i -e "s/__GNOME_SETUP__//" SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh + + # + # Insert install tar + # cat $PACKAGE_NAME.tar.xz >> SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh chmod 755 SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh diff --git a/dist/install.Debian_10.sh b/dist/install.Debian_10.sh new file mode 100644 index 0000000..b9fe0a2 --- /dev/null +++ b/dist/install.Debian_10.sh @@ -0,0 +1,21 @@ +enableGnomeExtension() { + EXTENSION="ubuntu-appindicator@ubuntu.com" + PACKAGE="gnome-shell-extension-appindicator" + ENABLE_CMD="gnome-shell-extension-tool -e ubuntu-appindicator@ubuntu.com" + # + # Is the extension installed? + # + if [ -d /usr/share/gnome-shell/extensions/$EXTENSION ] || [ -d ~/.local/share/gnome-shell/extensions/$EXTENSION ] ; then + $ENABLE_CMD + else + echo "Please install: "$PACKAGE + echo "And run: "$ENABLE_CMD + fi +} + +# +# Enable the gnome shell extension for the local user +# +if [ "$XDG_CURRENT_DESKTOP" == "GNOME" ] ; then + enableGnomeExtension +fi diff --git a/dist/install.Fedora_31.sh b/dist/install.Fedora_31.sh new file mode 100644 index 0000000..6a0c3b0 --- /dev/null +++ b/dist/install.Fedora_31.sh @@ -0,0 +1,21 @@ +enableGnomeExtension() { + EXTENSION="appindicatorsupport@rgcjonas.gmail.com" + PACKAGE="gnome-shell-extension-appindicator" + ENABLE_CMD="gnome-shell-extension-tool -e appindicatorsupport@rgcjonas.gmail.com" + # + # Is the extension installed? + # + if [ -d /usr/share/gnome-shell/extensions/$EXTENSION ] || [ -d ~/.local/share/gnome-shell/extensions/$EXTENSION ] ; then + $ENABLE_CMD + else + echo "Please install: "$PACKAGE + echo "And run: "$ENABLE_CMD + fi +} + +# +# Enable the gnome shell extension for the local user +# +if [ "$XDG_CURRENT_DESKTOP" == "GNOME" ] ; then + enableGnomeExtension +fi diff --git a/dist/install.SLE_15.sh b/dist/install.SLE_15.sh new file mode 100644 index 0000000..6a0c3b0 --- /dev/null +++ b/dist/install.SLE_15.sh @@ -0,0 +1,21 @@ +enableGnomeExtension() { + EXTENSION="appindicatorsupport@rgcjonas.gmail.com" + PACKAGE="gnome-shell-extension-appindicator" + ENABLE_CMD="gnome-shell-extension-tool -e appindicatorsupport@rgcjonas.gmail.com" + # + # Is the extension installed? + # + if [ -d /usr/share/gnome-shell/extensions/$EXTENSION ] || [ -d ~/.local/share/gnome-shell/extensions/$EXTENSION ] ; then + $ENABLE_CMD + else + echo "Please install: "$PACKAGE + echo "And run: "$ENABLE_CMD + fi +} + +# +# Enable the gnome shell extension for the local user +# +if [ "$XDG_CURRENT_DESKTOP" == "GNOME" ] ; then + enableGnomeExtension +fi diff --git a/dist/install.SLE_15_SP1.sh b/dist/install.SLE_15_SP1.sh new file mode 100644 index 0000000..6a0c3b0 --- /dev/null +++ b/dist/install.SLE_15_SP1.sh @@ -0,0 +1,21 @@ +enableGnomeExtension() { + EXTENSION="appindicatorsupport@rgcjonas.gmail.com" + PACKAGE="gnome-shell-extension-appindicator" + ENABLE_CMD="gnome-shell-extension-tool -e appindicatorsupport@rgcjonas.gmail.com" + # + # Is the extension installed? + # + if [ -d /usr/share/gnome-shell/extensions/$EXTENSION ] || [ -d ~/.local/share/gnome-shell/extensions/$EXTENSION ] ; then + $ENABLE_CMD + else + echo "Please install: "$PACKAGE + echo "And run: "$ENABLE_CMD + fi +} + +# +# Enable the gnome shell extension for the local user +# +if [ "$XDG_CURRENT_DESKTOP" == "GNOME" ] ; then + enableGnomeExtension +fi diff --git a/dist/install.openSUSE_Leap_15.1.sh b/dist/install.openSUSE_Leap_15.1.sh new file mode 100644 index 0000000..6a0c3b0 --- /dev/null +++ b/dist/install.openSUSE_Leap_15.1.sh @@ -0,0 +1,21 @@ +enableGnomeExtension() { + EXTENSION="appindicatorsupport@rgcjonas.gmail.com" + PACKAGE="gnome-shell-extension-appindicator" + ENABLE_CMD="gnome-shell-extension-tool -e appindicatorsupport@rgcjonas.gmail.com" + # + # Is the extension installed? + # + if [ -d /usr/share/gnome-shell/extensions/$EXTENSION ] || [ -d ~/.local/share/gnome-shell/extensions/$EXTENSION ] ; then + $ENABLE_CMD + else + echo "Please install: "$PACKAGE + echo "And run: "$ENABLE_CMD + fi +} + +# +# Enable the gnome shell extension for the local user +# +if [ "$XDG_CURRENT_DESKTOP" == "GNOME" ] ; then + enableGnomeExtension +fi diff --git a/dist/install.openSUSE_Leap_15.2.sh b/dist/install.openSUSE_Leap_15.2.sh new file mode 100644 index 0000000..6a0c3b0 --- /dev/null +++ b/dist/install.openSUSE_Leap_15.2.sh @@ -0,0 +1,21 @@ +enableGnomeExtension() { + EXTENSION="appindicatorsupport@rgcjonas.gmail.com" + PACKAGE="gnome-shell-extension-appindicator" + ENABLE_CMD="gnome-shell-extension-tool -e appindicatorsupport@rgcjonas.gmail.com" + # + # Is the extension installed? + # + if [ -d /usr/share/gnome-shell/extensions/$EXTENSION ] || [ -d ~/.local/share/gnome-shell/extensions/$EXTENSION ] ; then + $ENABLE_CMD + else + echo "Please install: "$PACKAGE + echo "And run: "$ENABLE_CMD + fi +} + +# +# Enable the gnome shell extension for the local user +# +if [ "$XDG_CURRENT_DESKTOP" == "GNOME" ] ; then + enableGnomeExtension +fi diff --git a/dist/install.openSUSE_Tumbleweed.sh b/dist/install.openSUSE_Tumbleweed.sh new file mode 100644 index 0000000..6a0c3b0 --- /dev/null +++ b/dist/install.openSUSE_Tumbleweed.sh @@ -0,0 +1,21 @@ +enableGnomeExtension() { + EXTENSION="appindicatorsupport@rgcjonas.gmail.com" + PACKAGE="gnome-shell-extension-appindicator" + ENABLE_CMD="gnome-shell-extension-tool -e appindicatorsupport@rgcjonas.gmail.com" + # + # Is the extension installed? + # + if [ -d /usr/share/gnome-shell/extensions/$EXTENSION ] || [ -d ~/.local/share/gnome-shell/extensions/$EXTENSION ] ; then + $ENABLE_CMD + else + echo "Please install: "$PACKAGE + echo "And run: "$ENABLE_CMD + fi +} + +# +# Enable the gnome shell extension for the local user +# +if [ "$XDG_CURRENT_DESKTOP" == "GNOME" ] ; then + enableGnomeExtension +fi diff --git a/dist/install.sh b/dist/install.sh index 713da10..6bb78ee 100755 --- a/dist/install.sh +++ b/dist/install.sh @@ -113,6 +113,7 @@ for i in `grep "Path=" $PROFILES/profiles.ini | sed -e "s/Path=//"` ; do mkdir -p $PROFILES/$i/extensions cp -f ${DESTINATION}/systray-x@Ximi1970.xpi $PROFILES/$i/extensions done +__GNOME_SETUP__ # # Done diff --git a/dist/install.xUbuntu_18.04.sh b/dist/install.xUbuntu_18.04.sh new file mode 100644 index 0000000..312470b --- /dev/null +++ b/dist/install.xUbuntu_18.04.sh @@ -0,0 +1,21 @@ +enableGnomeExtension() { + EXTENSION="ubuntu-appindicator@ubuntu.com" + PACKAGE="gnome-shell-extension-appindicator" + ENABLE_CMD="gnome-shell-extension-tool -e ubuntu-appindicator@ubuntu.com" + # + # Is the extension installed? + # + if [ -d /usr/share/gnome-shell/extensions/$EXTENSION ] || [ -d ~/.local/share/gnome-shell/extensions/$EXTENSION ] ; then + $ENABLE_CMD + else + echo "Please install: "$PACKAGE + echo "And run: "$ENABLE_CMD + fi +} + +# +# Enable the gnome shell extension for the local user +# +if [ "$XDG_CURRENT_DESKTOP" == "ubuntu:GNOME" ] ; then + enableGnomeExtension +fi diff --git a/dist/install.xUbuntu_19.04.sh b/dist/install.xUbuntu_19.04.sh new file mode 100644 index 0000000..312470b --- /dev/null +++ b/dist/install.xUbuntu_19.04.sh @@ -0,0 +1,21 @@ +enableGnomeExtension() { + EXTENSION="ubuntu-appindicator@ubuntu.com" + PACKAGE="gnome-shell-extension-appindicator" + ENABLE_CMD="gnome-shell-extension-tool -e ubuntu-appindicator@ubuntu.com" + # + # Is the extension installed? + # + if [ -d /usr/share/gnome-shell/extensions/$EXTENSION ] || [ -d ~/.local/share/gnome-shell/extensions/$EXTENSION ] ; then + $ENABLE_CMD + else + echo "Please install: "$PACKAGE + echo "And run: "$ENABLE_CMD + fi +} + +# +# Enable the gnome shell extension for the local user +# +if [ "$XDG_CURRENT_DESKTOP" == "ubuntu:GNOME" ] ; then + enableGnomeExtension +fi diff --git a/dist/install.xUbuntu_19.10.sh b/dist/install.xUbuntu_19.10.sh new file mode 100644 index 0000000..312470b --- /dev/null +++ b/dist/install.xUbuntu_19.10.sh @@ -0,0 +1,21 @@ +enableGnomeExtension() { + EXTENSION="ubuntu-appindicator@ubuntu.com" + PACKAGE="gnome-shell-extension-appindicator" + ENABLE_CMD="gnome-shell-extension-tool -e ubuntu-appindicator@ubuntu.com" + # + # Is the extension installed? + # + if [ -d /usr/share/gnome-shell/extensions/$EXTENSION ] || [ -d ~/.local/share/gnome-shell/extensions/$EXTENSION ] ; then + $ENABLE_CMD + else + echo "Please install: "$PACKAGE + echo "And run: "$ENABLE_CMD + fi +} + +# +# Enable the gnome shell extension for the local user +# +if [ "$XDG_CURRENT_DESKTOP" == "ubuntu:GNOME" ] ; then + enableGnomeExtension +fi