reorder if

arevindh · Feb 22, 2024 · 90e5533 · 90e5533
1 parent 72c4eaa
commit 90e5533
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/advanced/Scripts/speedtestmod/mod.sh b/advanced/Scripts/speedtestmod/mod.sh
@@ -117,14 +117,15 @@ manageHistory() {
 }
 
 notInstalled() {
-    if [ -x "$(command -v yum)" ] || [ -x "$(command -v dnf)" ]; then
-        rpm -q "$1" &>/dev/null || return 0
-    elif [ -x "$(command -v apt-get)" ]; then
+    if [ -x "$(command -v apt-get)" ]; then
         dpkg -s "$1" &>/dev/null || return 0
+    elif [ -x "$(command -v dnf)" ] || [ -x "$(command -v yum)" ]; then
+        rpm -q "$1" &>/dev/null || return 0
     else
         echo "Unsupported package manager!"
         exit 1
     fi
+
     return 1
 }
 

diff --git a/advanced/Scripts/speedtestmod/speedtest.sh b/advanced/Scripts/speedtestmod/speedtest.sh
@@ -62,10 +62,10 @@ swaptest() {
 }
 
 notInstalled() {
-    if [ -x "$(command -v yum)" ] || [ -x "$(command -v dnf)" ]; then
-        rpm -q "$1" &>/dev/null || return 0
-    elif [ -x "$(command -v apt-get)" ]; then
+    if [ -x "$(command -v apt-get)" ]; then
         dpkg -s "$1" &>/dev/null || return 0
+    elif [ -x "$(command -v dnf)" ] || [ -x "$(command -v yum)" ]; then
+        rpm -q "$1" &>/dev/null || return 0
     else
         echo "Unsupported package manager!"
         mv -f "$out" /var/log/pihole/speedtest.log