treehouses services supported arches (fixes #1836) (#1852)

Co-authored-by: dogi <[email protected]>
treehouses · Feb 20, 2021 · a67e4de · a67e4de
1 parent 0514a22
commit a67e4de
Show file tree

Hide file tree

Showing 31 changed files with 62 additions and 63 deletions.
diff --git a/modules/services.sh b/modules/services.sh
@@ -19,7 +19,7 @@ function services {
         do
           if [[ ! $file = *"README.md"* ]]; then
             service=$(echo "${file##*/}" | sed -e 's/^install-//' -e 's/.sh$//')
-            if check_arm $service; then
+            if check_arch $service; then
               echo $service
             fi
           fi
@@ -492,11 +492,10 @@ function services {
   esac
 }
 
-function check_arm {
-  arms=($(source $SERVICES/install-${1}.sh && supported_arms))
-  for i in "${arms[@]}"
-  do
-    if [ "$(detect arch)" = "$i" ]; then
+function check_arch {
+  arches=($(source $SERVICES/install-${1}.sh && supported_arches))
+  for i in "${arches[@]}"; do
+    if [ "$(detect arch)" == "$i" ]; then
       return 0
     fi
   done

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@treehouses/cli",
-  "version": "1.25.3",
+  "version": "1.25.4",
   "remote": "4000",
   "description": "Thin command-line interface for Raspberry Pi low level configuration.",
   "main": "cli.sh",

diff --git a/services/install-bookstack.sh b/services/install-bookstack.sh
@@ -65,8 +65,8 @@ function uses_env {
   echo true
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "aarch64"
   echo "x86_64"

diff --git a/services/install-cloud9.sh b/services/install-cloud9.sh
@@ -35,8 +35,8 @@ function uses_env {
   echo false
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "aarch64"
   echo "x86_64"

diff --git a/services/install-couchdb.sh b/services/install-couchdb.sh
@@ -34,8 +34,8 @@ function uses_env {
   echo false
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "armv6l"
   echo "x86_64"

diff --git a/services/install-dokuwiki.sh b/services/install-dokuwiki.sh
@@ -39,8 +39,8 @@ function uses_env {
   echo false
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "aarch64"
   echo "x86_64"

diff --git a/services/install-grocy.sh b/services/install-grocy.sh
@@ -51,8 +51,8 @@ function uses_env {
   echo true
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "x86_64"
   echo "aarch64"

diff --git a/services/install-invoiceninja.sh b/services/install-invoiceninja.sh
@@ -171,8 +171,8 @@ function uses_env {
   echo true
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
 }
 

diff --git a/services/install-jellyfin.sh b/services/install-jellyfin.sh
@@ -50,7 +50,7 @@ function uses_env {
 }
 
 # add supported arch(es)
-function supported_arms {
+function supported_arches {
   echo "armv7l"
   echo "aarch64"
   echo "x86_64"

diff --git a/services/install-kolibri.sh b/services/install-kolibri.sh
@@ -33,8 +33,8 @@ function uses_env {
   echo false
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "x86_64"
 }

diff --git a/services/install-librespeed.sh b/services/install-librespeed.sh
@@ -54,8 +54,8 @@ function uses_env {
   echo true
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "x86_64"
   echo "aarch64"

diff --git a/services/install-mariadb.sh b/services/install-mariadb.sh
@@ -38,8 +38,8 @@ function uses_env {
   echo true
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "armv6l"
 }

diff --git a/services/install-mastodon.sh b/services/install-mastodon.sh
@@ -73,8 +73,8 @@ function uses_env {
   echo false
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
 }
 

diff --git a/services/install-minetest.sh b/services/install-minetest.sh
@@ -47,8 +47,8 @@ function uses_env {
   echo true
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "x86_64"
   echo "aarch64"

diff --git a/services/install-mongodb.sh b/services/install-mongodb.sh
@@ -46,8 +46,8 @@ function uses_env {
   echo true
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "armv6l"
 }

diff --git a/services/install-moodle.sh b/services/install-moodle.sh
@@ -59,8 +59,8 @@ function uses_env {
   echo true
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "aarch64"
 }

diff --git a/services/install-musicblocks.sh b/services/install-musicblocks.sh
@@ -31,8 +31,8 @@ function uses_env {
   echo false
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "armv6l"
   echo "x86_64"

diff --git a/services/install-netdata.sh b/services/install-netdata.sh
@@ -41,8 +41,8 @@ function uses_env {
   echo false
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "armv6l"
   echo "x86_64"

diff --git a/services/install-nextcloud.sh b/services/install-nextcloud.sh
@@ -33,8 +33,8 @@ function uses_env {
   echo false
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "x86_64"
   echo "aarch64"

diff --git a/services/install-ntopng.sh b/services/install-ntopng.sh
@@ -33,8 +33,8 @@ function uses_env {
   echo false
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
 }
 

diff --git a/services/install-pihole.sh b/services/install-pihole.sh
@@ -65,8 +65,8 @@ function uses_env {
   echo true
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "armv6l"
   echo "aarch64"

diff --git a/services/install-piwigo.sh b/services/install-piwigo.sh
@@ -57,8 +57,8 @@ function uses_env {
   echo true
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "aarch64"
   echo "x86_64"

diff --git a/services/install-planet.sh b/services/install-planet.sh
@@ -67,8 +67,8 @@ function uses_env {
   echo false
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "armv6l"
 }

diff --git a/services/install-portainer.sh b/services/install-portainer.sh
@@ -36,8 +36,8 @@ function uses_env {
   echo false
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "armv6l"
   echo "x86_64"

diff --git a/services/install-privatebin.sh b/services/install-privatebin.sh
@@ -33,8 +33,8 @@ function uses_env {
   echo false
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "armv6l"
   echo "aarch64"

diff --git a/services/install-pylon.sh b/services/install-pylon.sh
@@ -44,8 +44,8 @@ function uses_env {
   echo true
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "aarch64"
   echo "x86_64"

diff --git a/services/install-rutorrent.sh b/services/install-rutorrent.sh
@@ -42,8 +42,8 @@ function uses_env {
   echo false
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "aarch64"
   echo "x86_64"

diff --git a/services/install-seafile.sh b/services/install-seafile.sh
@@ -51,8 +51,8 @@ function uses_env {
   echo true
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "armv6l"
   echo "x86_64"

diff --git a/services/install-transmission.sh b/services/install-transmission.sh
@@ -44,8 +44,8 @@ function uses_env {
   echo false
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "aarch64"
   echo "x86_64"

diff --git a/services/install-turtleblocksjs.sh b/services/install-turtleblocksjs.sh
@@ -31,8 +31,8 @@ function uses_env {
   echo false
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "armv6l"
   echo "x86_64"

diff --git a/services/install-webssh.sh b/services/install-webssh.sh
@@ -37,7 +37,7 @@ function uses_env {
 }
 
 # add supported arch(es)
-function supported_arms {
+function supported_arches {
   echo "armv7l"
   echo "armv6l"
   echo "aarch64"