From 276e54ebc3a9345de09408626c992cc7dc42ee7a Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Wed, 29 Sep 2021 23:14:03 +0200 Subject: [PATCH] Update package generators --- ....1-Gnome.sh => install.Debian_11-Gnome.sh} | 28 ++++++------------- ...ora_32-Kde.sh => install.Debian_11-Kde.sh} | 18 ++++++------ ...tall.Fedora_32.sh => install.Debian_11.sh} | 6 ++-- ...32-Gnome.sh => install.Fedora_34-Gnome.sh} | 0 ...ora_31-Kde.sh => install.Fedora_34-Kde.sh} | 0 ...tall.Fedora_31.sh => install.Fedora_34.sh} | 0 ...1-Gnome.sh => install.SLE_15_SP2-Gnome.sh} | 0 ...LE_15-Kde.sh => install.SLE_15_SP2-Kde.sh} | 0 ...nstall.SLE_15.sh => install.SLE_15_SP2.sh} | 0 ...5-Gnome.sh => install.SLE_15_SP3-Gnome.sh} | 2 +- ...5_SP1-Kde.sh => install.SLE_15_SP3-Kde.sh} | 0 ...ll.SLE_15_SP1.sh => install.SLE_15_SP3.sh} | 0 ...sh => install.openSUSE_Leap_15.3-Gnome.sh} | 11 ++++---- ...e.sh => install.openSUSE_Leap_15.3-Kde.sh} | 0 ..._15.1.sh => install.openSUSE_Leap_15.3.sh} | 0 ...nome.sh => install.xUbuntu_21.04-Gnome.sh} | 0 ...10-Kde.sh => install.xUbuntu_21.04-Kde.sh} | 0 ...untu_20.10.sh => install.xUbuntu_21.04.sh} | 0 18 files changed, 26 insertions(+), 39 deletions(-) rename dist/{install.openSUSE_Leap_15.1-Gnome.sh => install.Debian_11-Gnome.sh} (71%) rename dist/{install.Fedora_32-Kde.sh => install.Debian_11-Kde.sh} (62%) rename dist/{install.Fedora_32.sh => install.Debian_11.sh} (76%) rename dist/{install.Fedora_32-Gnome.sh => install.Fedora_34-Gnome.sh} (100%) rename dist/{install.Fedora_31-Kde.sh => install.Fedora_34-Kde.sh} (100%) rename dist/{install.Fedora_31.sh => install.Fedora_34.sh} (100%) rename dist/{install.SLE_15_SP1-Gnome.sh => install.SLE_15_SP2-Gnome.sh} (100%) rename dist/{install.SLE_15-Kde.sh => install.SLE_15_SP2-Kde.sh} (100%) rename dist/{install.SLE_15.sh => install.SLE_15_SP2.sh} (100%) rename dist/{install.SLE_15-Gnome.sh => install.SLE_15_SP3-Gnome.sh} (99%) rename dist/{install.SLE_15_SP1-Kde.sh => install.SLE_15_SP3-Kde.sh} (100%) rename dist/{install.SLE_15_SP1.sh => install.SLE_15_SP3.sh} (100%) rename dist/{install.Fedora_31-Gnome.sh => install.openSUSE_Leap_15.3-Gnome.sh} (86%) rename dist/{install.openSUSE_Leap_15.1-Kde.sh => install.openSUSE_Leap_15.3-Kde.sh} (100%) rename dist/{install.openSUSE_Leap_15.1.sh => install.openSUSE_Leap_15.3.sh} (100%) rename dist/{install.xUbuntu_20.10-Gnome.sh => install.xUbuntu_21.04-Gnome.sh} (100%) rename dist/{install.xUbuntu_20.10-Kde.sh => install.xUbuntu_21.04-Kde.sh} (100%) rename dist/{install.xUbuntu_20.10.sh => install.xUbuntu_21.04.sh} (100%) diff --git a/dist/install.openSUSE_Leap_15.1-Gnome.sh b/dist/install.Debian_11-Gnome.sh similarity index 71% rename from dist/install.openSUSE_Leap_15.1-Gnome.sh rename to dist/install.Debian_11-Gnome.sh index 99aee46..79cd9c4 100644 --- a/dist/install.openSUSE_Leap_15.1-Gnome.sh +++ b/dist/install.Debian_11-Gnome.sh @@ -3,19 +3,7 @@ enableGnomeExtension() { PACKAGE="gnome-shell-extension-appindicator" ENABLE_CMD="/usr/bin/gnome-shell-extension-tool" ENABLE_CMD_OPTIONS="-e ${EXTENSION}" - - if [ ! -x /usr/bin/gnome-shell-extension-tool ] ; then - echo - echo "Please install the package gnome-shell-devel:" - echo - echo "sudo zypper install gnome-shell-devel" - echo - echo "And run after the installer is finished:" - echo - echo $ENABLE_CMD $ENABLE_CMD_OPTIONS - echo - fi - + # # Is the extension installed? # @@ -37,7 +25,7 @@ enableGnomeExtension() { } # -# Check for Gnome +# Enable the gnome shell extension for the local user # if [ "$XDG_CURRENT_DESKTOP" == "GNOME" ] ; then enableGnomeExtension @@ -45,13 +33,13 @@ if [ "$XDG_CURRENT_DESKTOP" == "GNOME" ] ; then # # Check for Qt # - rpm -qa | grep -q libQt5Widgets5 + dpkg -l | grep -q libqt5widgets5 if [ "$?" == "1" ] ; then - echo - echo "Please install the package libqt5widgets5" - echo - echo "sudo zypper install libQt5Widgets5" - echo + echo + echo "Please install the package libqt5widgets5" + echo + echo "sudo apt install libqt5widgets5" + echo fi else # diff --git a/dist/install.Fedora_32-Kde.sh b/dist/install.Debian_11-Kde.sh similarity index 62% rename from dist/install.Fedora_32-Kde.sh rename to dist/install.Debian_11-Kde.sh index 26c4eb6..2e8f5ee 100644 --- a/dist/install.Fedora_32-Kde.sh +++ b/dist/install.Debian_11-Kde.sh @@ -1,25 +1,25 @@ -## -# Check for Kde +# +# Check for KDE # if [ "$XDG_CURRENT_DESKTOP" == "KDE" ] ; then # # Check for Qt # - dnf list installed "qt5-qtbase*" | grep -q qt5-qtbase-gui + dpkg -l | grep -q libqt5widgets5 if [ "$?" == "1" ] ; then echo - echo "Please install the package qt5-qtbase-gui" + echo "Please install the package libqt5widgets5" echo - echo "sudo dnf install qt5-qtbase-gui" + echo "sudo apt install libqt5widgets5" echo fi - - dnf list installed "kf5*" | grep -q kf5-knotifications + + dpkg -l | grep -q libkf5notifications5 if [ "$?" == "1" ] ; then echo - echo "Please install the package kf5-knotifications" + echo "Please install the package libkf5notifications5" echo - echo "sudo dnf install kf5-knotifications" + echo "sudo apt install libkf5notifications5" echo fi else diff --git a/dist/install.Fedora_32.sh b/dist/install.Debian_11.sh similarity index 76% rename from dist/install.Fedora_32.sh rename to dist/install.Debian_11.sh index 74e28ca..eae575f 100644 --- a/dist/install.Fedora_32.sh +++ b/dist/install.Debian_11.sh @@ -19,12 +19,12 @@ else # # Check for Qt # - dnf list installed "qt5-qtbase*" | grep -q qt5-qtbase-gui + dpkg -l | grep -q libqt5widgets5 if [ "$?" == "1" ] ; then echo - echo "Please install the package qt5-qtbase-gui" + echo "Please install the package libqt5widgets5" echo - echo "sudo dnf install qt5-qtbase-gui" + echo "sudo apt install libqt5widgets5" echo fi fi diff --git a/dist/install.Fedora_32-Gnome.sh b/dist/install.Fedora_34-Gnome.sh similarity index 100% rename from dist/install.Fedora_32-Gnome.sh rename to dist/install.Fedora_34-Gnome.sh diff --git a/dist/install.Fedora_31-Kde.sh b/dist/install.Fedora_34-Kde.sh similarity index 100% rename from dist/install.Fedora_31-Kde.sh rename to dist/install.Fedora_34-Kde.sh diff --git a/dist/install.Fedora_31.sh b/dist/install.Fedora_34.sh similarity index 100% rename from dist/install.Fedora_31.sh rename to dist/install.Fedora_34.sh diff --git a/dist/install.SLE_15_SP1-Gnome.sh b/dist/install.SLE_15_SP2-Gnome.sh similarity index 100% rename from dist/install.SLE_15_SP1-Gnome.sh rename to dist/install.SLE_15_SP2-Gnome.sh diff --git a/dist/install.SLE_15-Kde.sh b/dist/install.SLE_15_SP2-Kde.sh similarity index 100% rename from dist/install.SLE_15-Kde.sh rename to dist/install.SLE_15_SP2-Kde.sh diff --git a/dist/install.SLE_15.sh b/dist/install.SLE_15_SP2.sh similarity index 100% rename from dist/install.SLE_15.sh rename to dist/install.SLE_15_SP2.sh diff --git a/dist/install.SLE_15-Gnome.sh b/dist/install.SLE_15_SP3-Gnome.sh similarity index 99% rename from dist/install.SLE_15-Gnome.sh rename to dist/install.SLE_15_SP3-Gnome.sh index e411214..125ba62 100644 --- a/dist/install.SLE_15-Gnome.sh +++ b/dist/install.SLE_15_SP3-Gnome.sh @@ -2,7 +2,7 @@ enableGnomeExtension() { EXTENSION="appindicatorsupport@rgcjonas.gmail.com" PACKAGE="gnome-shell-extension-appindicator" ENABLE_CMD="gnome-shell-extension-tool -e ${EXTENSION}" - + if [ ! -x /usr/bin/gnome-shell-extension-tool ] ; then echo echo "Please install the package gnome-shell-devel:" diff --git a/dist/install.SLE_15_SP1-Kde.sh b/dist/install.SLE_15_SP3-Kde.sh similarity index 100% rename from dist/install.SLE_15_SP1-Kde.sh rename to dist/install.SLE_15_SP3-Kde.sh diff --git a/dist/install.SLE_15_SP1.sh b/dist/install.SLE_15_SP3.sh similarity index 100% rename from dist/install.SLE_15_SP1.sh rename to dist/install.SLE_15_SP3.sh diff --git a/dist/install.Fedora_31-Gnome.sh b/dist/install.openSUSE_Leap_15.3-Gnome.sh similarity index 86% rename from dist/install.Fedora_31-Gnome.sh rename to dist/install.openSUSE_Leap_15.3-Gnome.sh index 3f661d6..b3c3c97 100644 --- a/dist/install.Fedora_31-Gnome.sh +++ b/dist/install.openSUSE_Leap_15.3-Gnome.sh @@ -3,7 +3,7 @@ enableGnomeExtension() { PACKAGE="gnome-shell-extension-appindicator" ENABLE_CMD="/usr/bin/gnome-extensions" ENABLE_CMD_OPTIONS="enable ${EXTENSION}" - + # # Is the extension installed? # @@ -25,7 +25,7 @@ enableGnomeExtension() { } # -# Enable the gnome shell extension for the local user +# Check for Gnome # if [ "$XDG_CURRENT_DESKTOP" == "GNOME" ] ; then enableGnomeExtension @@ -33,12 +33,12 @@ if [ "$XDG_CURRENT_DESKTOP" == "GNOME" ] ; then # # Check for Qt # - dnf list installed "qt5-qtbase*" | grep -q qt5-qtbase-gui + rpm -qa | grep -q libQt5Widgets5 if [ "$?" == "1" ] ; then echo - echo "Please install the package qt5-qtbase-gui" + echo "Please install the package libqt5widgets5" echo - echo "sudo dnf install qt5-qtbase-gui" + echo "sudo zypper install libQt5Widgets5" echo fi else @@ -57,4 +57,3 @@ else echo fi fi - diff --git a/dist/install.openSUSE_Leap_15.1-Kde.sh b/dist/install.openSUSE_Leap_15.3-Kde.sh similarity index 100% rename from dist/install.openSUSE_Leap_15.1-Kde.sh rename to dist/install.openSUSE_Leap_15.3-Kde.sh diff --git a/dist/install.openSUSE_Leap_15.1.sh b/dist/install.openSUSE_Leap_15.3.sh similarity index 100% rename from dist/install.openSUSE_Leap_15.1.sh rename to dist/install.openSUSE_Leap_15.3.sh diff --git a/dist/install.xUbuntu_20.10-Gnome.sh b/dist/install.xUbuntu_21.04-Gnome.sh similarity index 100% rename from dist/install.xUbuntu_20.10-Gnome.sh rename to dist/install.xUbuntu_21.04-Gnome.sh diff --git a/dist/install.xUbuntu_20.10-Kde.sh b/dist/install.xUbuntu_21.04-Kde.sh similarity index 100% rename from dist/install.xUbuntu_20.10-Kde.sh rename to dist/install.xUbuntu_21.04-Kde.sh diff --git a/dist/install.xUbuntu_20.10.sh b/dist/install.xUbuntu_21.04.sh similarity index 100% rename from dist/install.xUbuntu_20.10.sh rename to dist/install.xUbuntu_21.04.sh