Merge branch 'stretch' of https://github.com/bashrc/freedombone

src/freedombone-app-jitsi

@@ -33,6 +33,7 @@ VARIANTS=""
 IN_DEFAULT_INSTALL=0
 SHOW_ON_ABOUT=0
 NOT_ON_ONION=1
+NOT_ON_ARM=1
 
 VIDEOBRIDGE_PORT=5347
 JITSI_ONION_PORT=8102

src/freedombone-app-peertube

@@ -33,6 +33,7 @@ VARIANTS="full full-vim media"
 
 IN_DEFAULT_INSTALL=0
 SHOW_ON_ABOUT=1
+NOT_ON_ONION=1
 
 PEERTUBE_DOMAIN_NAME=
 PEERTUBE_CODE=

src/freedombone-base-email

@@ -1669,7 +1669,9 @@ function prevent_mail_process_overrun {
     { echo '#!/bin/bash';
       echo "exim_ctr=\$(pgrep \"exim4\" | wc -l)";
       echo "if [ \"\$exim_ctr\" -gt 5 ]; then";
-      echo '    exim -bp | exiqgrep -i | xargs exim -Mrm';
+      echo '    systemctl stop exim4';
+      echo '    exim -bp | exiqgrep -i | xargs exim -Mrm 2> /dev/null';
+      echo '    systemctl start exim4';
       echo 'fi'; } > /usr/bin/exim_check
     chmod +x /usr/bin/exim_check
     cron_add_mins 5 '/usr/bin/exim_check'

src/freedombone-image-customise

@@ -1990,8 +1990,6 @@ image_preinstall_repos() {
     git clone "$BDSMAIL_REPO" "$rootdir/repos/bdsmail"
     #git clone "$WEKAN_REPO" "$rootdir/repos/wekan"
     #git clone "$FLOW_ROUTER_REPO" "$rootdir/repos/flowrouter"
-    #git clone "$METEOR_USERACCOUNTS_REPO" "$rootdir/repos/meteoruseraccounts"
-    #git clone "$METEOR_REPO" "$rootdir/repos/meteor"
     #git clone "$ZERONET_REPO" "$rootdir/repos/zeronet"
     #git clone "$QTOX_REPO" "$rootdir/repos/qtox"
 }

src/freedombone-template

@@ -55,22 +55,22 @@ function show_help {
     echo $'Creates a new app script which can then be filled in'
     echo ''
     echo ''
-    echo $'  -h --help                            Show help'
-    echo $'  -a --app [name]                      Name of the application'
-    echo $'  -n --name [name]                     Your name'
-    echo $'  -e --email [address]                 Your email address'
-    echo $'  -r --repo [url]                      Git repo url for the app'
-    echo $'  -c --commit [hash]                   Git commit'
-    echo $'     --port [number]                   Port number for the app'
-    echo $'     --portinternal [number]           Internal port between a daemon and the web server'
-    echo $'     --node [yes|no]                   Is this a nodejs app?'
-    echo $'     --nodeapp [package]               Specify a nodejs package to install'
-    echo $'  -o --onion [yes|no]                  Is this app only available on an onion address?'
-    echo $'  -p --php [yes|no]                    Is this a PHP app?'
-    echo $'  -s --daemon [yes|no]                 Add a daemon'
-    echo $'  -d --database [mariadb|postgresql]   Type of database'
-    echo $'  -w --web [yes|no]                    Whether there is a web user interface (default is yes)'
-    echo $'     --dir [directory]                 Where to install to'
+    echo $'  -h --help                                   Show help'
+    echo $'  -a --app [name]                             Name of the application'
+    echo $'  -n --name [name]                            Your name'
+    echo $'  -e --email [address]                        Your email address'
+    echo $'  -r --repo [url]                             Git repo url for the app'
+    echo $'  -c --commit [hash]                          Git commit'
+    echo $'     --port [number]                          Port number for the app'
+    echo $'     --portinternal [number]                  Internal port between a daemon and the web server'
+    echo $'     --node [yes|no]                          Is this a nodejs app?'
+    echo $'     --nodeapp [package]                      Specify a nodejs package to install'
+    echo $'  -o --onion [yes|no]                         Is this app only available on an onion address?'
+    echo $'  -p --php [yes|no]                           Is this a PHP app?'
+    echo $'  -s --daemon [yes|no]                        Add a daemon'
+    echo $'  -d --database [mariadb|postgresql|mongodb]  Type of database'
+    echo $'  -w --web [yes|no]                           Whether there is a web user interface (default is yes)'
+    echo $'     --dir [directory]                        Where to install to'
     echo ''
     exit 0
 }
@@ -322,7 +322,7 @@ echo ''
 echo "    \"\${PROJECT_NAME}-pass\" -u \"\$curr_username\" -a ${app_name} -p \"\$new_user_password\""
 echo '}'
 
-if [[ "$database_type" == "mariadb" || "$database_type" == "mysql" || "$database_type" == "postgres"* ]]; then
+if [[ "$database_type" == "mariadb" || "$database_type" == "mysql" || "$database_type" == "postgres"* || "$database_type" == "mongo"* ]]; then
     echo ''
     echo "function ${app_name}_create_database {"
     echo "    if [ -f \$IMAGE_PASSWORD_FILE ]; then"
@@ -336,9 +336,13 @@ if [[ "$database_type" == "mariadb" || "$database_type" == "mysql" || "$database
     echo '        return'
     echo '    fi'
     echo ''
-    if [[ "$database_type" != "postgres"* ]]; then
+    if [[ "$database_type" = "mysql" || "$database_type" = "mariadb" ]]; then
         echo "    create_database ${app_name} \"\$${app_name_upper}_ADMIN_PASSWORD\" \$MY_USERNAME"
-    else
+    fi
+    if [[ "$database_type" = "mongo"* ]]; then
+        echo "    create_database_mongodb ${app_name} \"\$${app_name_upper}_ADMIN_PASSWORD\" \$MY_USERNAME"
+    fi
+    if [[ "$database_type" == "postgres"* ]]; then
         echo '    systemctl restart postgresql'
         echo "    run_system_query_postgresql \"CREATE USER peertube WITH PASSWORD '\$${app_name_upper}_ADMIN_PASSWORD';\""
         echo "    run_system_query_postgresql \"CREATE DATABASE ${app_name} OWNER ${app_name};\""
@@ -394,6 +398,9 @@ else
     echo "    set_repo_commit \"${app_dir}\" \"${app_name} commit\" \"\$${app_name_upper}_COMMIT\" \"\$${app_name_upper}_REPO\""
     echo "    chown -R ${app_name}:${app_name} \"${app_dir}\""
 fi
+if [ $app_daemon ]; then
+    echo "    systemctl restart ${app_name}"
+fi
 echo '}'
 echo ''
 echo "function backup_local_${app_name} {"
@@ -430,6 +437,11 @@ if [[ "$database_type" == "postgres"* ]]; then
     echo "    backup_database_to_usb ${app_name}"
     echo ''
 fi
+if [[ "$database_type" == "mongo"* ]]; then
+    echo '    USE_MONGODB=1'
+    echo "    backup_database_to_usb ${app_name}"
+    echo ''
+fi
 if [ $app_webui ]; then
     echo '    restart_site'
 fi
@@ -481,6 +493,16 @@ if [[ "$database_type" == "postgres"* ]]; then
     echo '    fi'
     echo ''
 fi
+if [[ "$database_type" == "mongo"* ]]; then
+    echo "    ${app_name}_create_database"
+    echo ''
+    echo '    USE_MONGODB=1'
+    echo "    restore_database ${app_name}"
+    echo "    if [ -d \$temp_restore_dir ]; then"
+    echo "        rm -rf \$temp_restore_dir"
+    echo '    fi'
+    echo ''
+fi
 echo "    restore_directory_from_usb \$temp_restore_dir ${app_name}"
 echo "    if [ -d \$temp_restore_dir ]; then"
 echo "        if [ -d \"\$temp_restore_dir\$${app_name}_dir\" ]; then"
@@ -539,6 +561,11 @@ if [[ "$database_type" == "postgres"* ]]; then
     echo "    backup_database_to_friend ${app_name}"
     echo ''
 fi
+if [[ "$database_type" == "mongo"* ]]; then
+    echo '    USE_MONGODB=1'
+    echo "    backup_database_to_friend ${app_name}"
+    echo ''
+fi
 if [ $app_daemon ]; then
     echo ''
     echo "    systemctl start ${app_name}"
@@ -592,6 +619,16 @@ if [[ "$database_type" == "postgres"* ]]; then
     echo '    fi'
     echo ''
 fi
+if [[ "$database_type" == "mongo"* ]]; then
+    echo "    ${app_name}_create_database"
+    echo ''
+    echo '    USE_MONGODB=1'
+    echo "    restore_database_from_friend ${app_name}"
+    echo "    if [ -d \"\$temp_restore_dir\" ]; then"
+    echo "        rm -rf \$temp_restore_dir"
+    echo '    fi'
+    echo ''
+fi
 echo "    restore_directory_from_friend \$temp_restore_dir ${app_name}"
 echo "    if [ -d \$temp_restore_dir ]; then"
 echo "        if [ -d \"\$temp_restore_dir\$${app_name}_dir\" ]; then"
@@ -655,6 +692,9 @@ fi
 if [[ "$database_type" == "postgres"* ]]; then
     echo "    drop_database_postgresql ${app_name}"
 fi
+if [[ "$database_type" == "mongo"* ]]; then
+    echo "    drop_database_mongodb ${app_name}"
+fi
 echo "    remove_onion_service ${app_name} \"\${${app_name_upper}_ONION_PORT}\""
 echo "    if grep -q \"${app_name}\" /etc/crontab; then"
 echo "        sed -i \"/${app_name}/d\" /etc/crontab"
@@ -683,6 +723,10 @@ if [[ "$database_type" == "postgres"* ]]; then
     echo '    install_postgresql'
     echo ''
 fi
+if [[ "$database_type" == "mongo"* ]]; then
+    echo '    install_mongodb'
+    echo ''
+fi
 if [[ "$app_node" == 'yes' ]]; then
     echo "    install_nodejs ${app_name}"
 fi
@@ -748,7 +792,7 @@ if [ $app_webui ]; then
     echo "    chown -R www-data:www-data \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\""
 fi
 
-if [[ "$database_type" == "mariadb" || "$database_type" == "mysql" || "$database_type" == "postgres"*  ]]; then
+if [[ "$database_type" == "mariadb" || "$database_type" == "mysql" || "$database_type" == "postgres"* || "$database_type" == "mongo"*  ]]; then
     echo ''
     echo "    ${app_name}_create_database"
 fi
@@ -860,7 +904,7 @@ if [ $app_webui ]; then
             echo "    { echo \"    try_files \\\$uri \\\$uri/ index.php?\\\$args;\";"
         fi
     else
-        echo "      echo \"    proxy_pass http://localhost:\$${app_name_upper}_PORT_INTERNAL;\";"
+        echo "      { echo \"    proxy_pass http://localhost:\$${app_name_upper}_PORT_INTERNAL;\";"
     fi
     echo "      echo '  }';"
     echo "      echo '}'; } >> \"\$${app_name}_nginx_site\""

src/freedombone-utils-firewall

@@ -54,10 +54,10 @@ function block_firefox_telemetry {
     # Within firefox source code see submit_telemetry_data.py
 
     if ! grep -q 'telemetry.mozilla' /etc/hosts; then
-	echo '127.0.0.1  telemetry.mozilla.org' >> /etc/hosts
-	echo '127.0.0.1  incoming.telemetry.mozilla.org' >> /etc/hosts
+    echo '127.0.0.1  telemetry.mozilla.org' >> /etc/hosts
+    echo '127.0.0.1  incoming.telemetry.mozilla.org' >> /etc/hosts
     fi
-        
+
     if grep -q "$FIREFOX_TELEMETRY_IP" /etc/firewall.conf; then
         return
     fi
@@ -360,32 +360,32 @@ function mesh_firewall {
     FIREWALL_FILENAME="${rootdir}/etc/systemd/system/meshfirewall.service"
     MESH_FIREWALL_SCRIPT=${rootdir}/usr/bin/mesh-firewall
 
-    if ! grep -q 'telemetry.mozilla' ${rootdir}/etc/hosts; then
-	echo '127.0.0.1       telemetry.mozilla.org' >> ${rootdir}/etc/hosts
-	echo '127.0.0.1       incoming.telemetry.mozilla.org' >> ${rootdir}/etc/hosts
-    fi
-
-    if ! grep -q 'facebook' ${rootdir}/etc/hosts; then
-	{ echo '127.0.0.1       www.facebook.com';
-	  echo '127.0.0.1       facebook.com';
-	  echo '127.0.0.1       static.ak.fbcdn.net';
-	  echo '127.0.0.1       www.static.ak.fbcdn.net';
-	  echo '127.0.0.1       login.facebook.com';
-	  echo '127.0.0.1       www.login.facebook.com';
-	  echo '127.0.0.1       fbcdn.net';
-	  echo '127.0.0.1       www.fbcdn.net';
-	  echo '127.0.0.1       fbcdn.com';
-	  echo '127.0.0.1       www.fbcdn.com';
-	  echo '127.0.0.1       static.ak.connect.facebook.com';
-	  echo '127.0.0.1       www.static.ak.connect.facebook.com'; } >> ${rootdir}/etc/hosts	
-    fi
-    
-    if ! grep -q 'google' ${rootdir}/etc/hosts; then
-	{ echo '127.0.0.1       www.google-analytics.com';
-	  echo '127.0.0.1       google-analytics.com';
-	  echo '127.0.0.1       ssl.google-analytics.com'; } >> ${rootdir}/etc/hosts
-    fi    
-    
+    if ! grep -q 'telemetry.mozilla' "${rootdir}/etc/hosts"; then
+    echo '127.0.0.1       telemetry.mozilla.org' >> "${rootdir}/etc/hosts"
+    echo '127.0.0.1       incoming.telemetry.mozilla.org' >> "${rootdir}/etc/hosts"
+    fi
+
+    if ! grep -q 'facebook' "${rootdir}/etc/hosts"; then
+    { echo '127.0.0.1       www.facebook.com';
+      echo '127.0.0.1       facebook.com';
+      echo '127.0.0.1       static.ak.fbcdn.net';
+      echo '127.0.0.1       www.static.ak.fbcdn.net';
+      echo '127.0.0.1       login.facebook.com';
+      echo '127.0.0.1       www.login.facebook.com';
+      echo '127.0.0.1       fbcdn.net';
+      echo '127.0.0.1       www.fbcdn.net';
+      echo '127.0.0.1       fbcdn.com';
+      echo '127.0.0.1       www.fbcdn.com';
+      echo '127.0.0.1       static.ak.connect.facebook.com';
+      echo '127.0.0.1       www.static.ak.connect.facebook.com'; } >> "${rootdir}/etc/hosts"
+    fi
+
+    if ! grep -q 'google' "${rootdir}/etc/hosts"; then
+    { echo '127.0.0.1       www.google-analytics.com';
+      echo '127.0.0.1       google-analytics.com';
+      echo '127.0.0.1       ssl.google-analytics.com'; } >> "${rootdir}/etc/hosts"
+    fi
+
     { echo '#!/bin/bash';
       echo 'iptables -P INPUT ACCEPT';
       echo 'ip6tables -P INPUT ACCEPT';

src/freedombone-utils-meteor

@@ -1,216 +0,0 @@
-#!/bin/bash
-#  _____               _           _
-# |   __|___ ___ ___ _| |___ _____| |_ ___ ___ ___
-# |   __|  _| -_| -_| . | . |     | . | . |   | -_|
-# |__|  |_| |___|___|___|___|_|_|_|___|___|_|_|___|
-#
-#                              Freedom in the Cloud
-#
-# Functions for installing meteor
-# See meteor.com
-#
-# License
-# =======
-#
-# Copyright (C) 2017-2018 Bob Mottram <bob@freedombone.net>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-METEOR_RELEASE='1.4.4.1'
-METEOR_REPO="https://github.com/meteor/meteor"
-METEOR_COMMIT='b52c6587d7542c0f27481a3bee8c65be06068ac1'
-METEOR_USERACCOUNTS_REPO="git://github.com/meteor-useraccounts/core.git"
-METEOR_USERACCOUNTS_COMMIT='2e8986813b51f321f908d2f6211f6f81f76cd627'
-
-function meteor_cleanUp {
-    rm -rf "$TARBALL_FILE"
-    rm -rf "$INSTALL_TMPDIR"
-}
-
-function install_meteor_script {
-    meteor_dir="$1"
-
-    if [ ! "$meteor_dir" ]; then
-        echo $'No meteor install directory specified'
-        exit 692025
-    fi
-
-    if [ ! -d "$meteor_dir" ]; then
-        echo $'Meteor install directory not found'
-        exit 845382
-    fi
-
-    if [[ "$(arch)" == "arm"* ]]; then
-        echo 'meteor does not support ARM'
-        exit 8362952
-    fi
-    if [[ "$(arch)" == "i386" || "$(arch)" == "x86_32" ]]; then
-        PLATFORM="os.linux.x86_32"
-    else
-        PLATFORM="os.linux.x86_64"
-    fi
-
-    RELEASE="$METEOR_RELEASE"
-
-    DIR_PREFIX="/usr/local"
-
-    TARBALL_URL="https://meteorinstall-4168.kxcdn.com/packages-bootstrap/${RELEASE}/meteor-bootstrap-${PLATFORM}.tar.gz"
-    INSTALL_TMPDIR="$meteor_dir/.meteor-install-tmp"
-    TARBALL_FILE="$meteor_dir/.meteor-tarball-tmp"
-
-    # Remove temporary files now in case they exist.
-    meteor_cleanUp
-
-    if [ -d "$INSTALL_TMPDIR" ]; then
-        rm -rf "$INSTALL_TMPDIR"
-    fi
-    mkdir "$INSTALL_TMPDIR"
-
-    if [ ! -f "${TARBALL_FILE}" ]; then
-        echo "Downloading Meteor distribution"
-        # keep trying to curl the file until it works (resuming where possible)
-        MAX_ATTEMPTS=10
-        RETRY_DELAY_SECS=5
-        set +e
-        ATTEMPTS=0
-        while [ $ATTEMPTS -lt $MAX_ATTEMPTS ]
-        do
-            ATTEMPTS=$((ATTEMPTS + 1))
-
-            if curl --progress-bar --fail --continue-at - \
-                    "$TARBALL_URL" --output "$TARBALL_FILE"; then
-                break
-            fi
-
-            echo "Retrying download in $RETRY_DELAY_SECS seconds..."
-            sleep $RETRY_DELAY_SECS
-        done
-    fi
-
-    if [ ! -f "${TARBALL_FILE}" ]; then
-        echo $'meteor tarball could not be downloaded'
-        exit 7272452
-    fi
-
-    tar -xzf "$TARBALL_FILE" -C "$INSTALL_TMPDIR" -o
-
-    if [ ! -f "${INSTALL_TMPDIR}/.meteor/meteor" ]; then
-        echo $'tarball not extracted'
-        exit 693252
-    fi
-
-    # shellcheck disable=SC2086
-    mv ${INSTALL_TMPDIR}/.meteor $meteor_dir
-
-    meteor_cleanUp
-
-    echo ''
-    echo "Meteor ${RELEASE} has been installed in $meteor_dir/.meteor"
-
-    METEOR_SYMLINK_TARGET="$(readlink "$meteor_dir/.meteor/meteor")"
-    METEOR_TOOL_DIRECTORY="$(dirname "$METEOR_SYMLINK_TARGET")"
-    LAUNCHER="$meteor_dir/.meteor/$METEOR_TOOL_DIRECTORY/scripts/admin/launch-meteor"
-
-    if cp "$LAUNCHER" "$DIR_PREFIX/bin/meteor" >/dev/null 2>&1; then
-        echo "Writing a launcher script to $DIR_PREFIX/bin/meteor for your convenience."
-        cat <<"EOF"
-
-To get started fast:
-
-  $ meteor create ~/my_cool_app
-  $ cd ~/my_cool_app
-  $ meteor
-
-Or see the docs at:
-
-  docs.meteor.com
-
-EOF
-    elif type sudo >/dev/null 2>&1; then
-        echo "Writing a launcher script to $DIR_PREFIX/bin/meteor for your convenience."
-        echo "This may prompt for your password."
-
-        # New macs (10.9+) don't ship with /usr/local, however it is still in
-        # the default PATH. We still install there, we just need to create the
-        # directory first.
-        # XXX this means that we can run sudo too many times. we should never
-        #     run it more than once if it fails the first time
-        if [ ! -d "$DIR_PREFIX/bin" ] ; then
-            sudo mkdir -m 755 "$DIR_PREFIX" || true
-            sudo mkdir -m 755 "$DIR_PREFIX/bin" || true
-        fi
-
-        if sudo cp "$LAUNCHER" "$DIR_PREFIX/bin/meteor"; then
-            cat <<"EOF"
-
-To get started fast:
-
-  $ meteor create ~/my_cool_app
-  $ cd ~/my_cool_app
-  $ meteor
-
-Or see the docs at:
-
-  docs.meteor.com
-
-EOF
-        else
-            cat <<EOF
-
-Couldn't write the launcher script. Please either:
-
-  (1) Run the following as root:
-        cp "$LAUNCHER" /usr/bin/meteor
-  (2) Add "\$meteor_dir/.meteor" to your path, or
-  (3) Rerun this command to try again.
-
-Then to get started, take a look at 'meteor --help' or see the docs at
-docs.meteor.com.
-EOF
-        fi
-    else
-        cat <<EOF
-
-Now you need to do one of the following:
-
-  (1) Add "\$meteor_dir/.meteor" to your path, or
-  (2) Run this command as root:
-        cp "$LAUNCHER" /usr/bin/meteor
-
-Then to get started, take a look at 'meteor --help' or see the docs at
-docs.meteor.com.
-EOF
-    fi
-
-}
-
-function install_meteor {
-    apt-get -yq install curl
-    if [ ! -d "$INSTALL_DIR/meteor" ]; then
-        mkdir "$INSTALL_DIR/meteor"
-    fi
-    cd "$INSTALL_DIR/meteor" || exit 72345274
-    install_meteor_script
-}
-
-function remove_meteor {
-    if [ -f /usr/local/bin/meteor ]; then
-        rm /usr/local/bin/meteor
-    fi
-    if [ -f /usr/bin/meteor ]; then
-        rm /usr/bin/meteor
-    fi
-}
-
-# NOTE: deliberately no exit 0

src/freedombone-utils-mongodb

@@ -29,6 +29,7 @@
 # Set this when calling backup and restore commands
 USE_MONGODB=
 MONGODB_APPS_FILE=$HOME/.mongodbapps
+MONGODB_PORT=27017
 
 function store_original_mongodb_password {
     if [ ! -f /root/.mongodboriginal ]; then

src/freedombone-utils-selector

@@ -286,6 +286,19 @@ function app_not_on_onion_only {
     echo "1"
 }
 
+function app_not_on_arm {
+    app_name="$1"
+
+    if grep -q "NOT_ON_ARM=1" "/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-${app_name}"; then
+        archtype=$(uname -m)
+        if [[ "$archtype" == 'arm'* ]]; then
+            echo "0"
+            return
+        fi
+    fi
+    echo "1"
+}
+
 function enough_ram_for_app {
     app_name="$1"
 
@@ -320,10 +333,12 @@ function detect_apps {
         app_name=$(echo "${filename}" | awk -F '-app-' '{print $2}')
         if [[ $(enough_ram_for_app "$app_name") == "0" ]]; then
             if [[ $(app_not_on_onion_only "$app_name") != "0" ]]; then
-                # shellcheck disable=SC2068
-                if ! item_in_array "${app_name}" ${APPS_AVAILABLE[@]}; then
-                    APPS_AVAILABLE+=("${app_name}")
-                    APPS_CHOSEN+=("0")
+                if [[ $(app_not_on_arm "$app_name") != "0" ]]; then
+                    # shellcheck disable=SC2068
+                    if ! item_in_array "${app_name}" ${APPS_AVAILABLE[@]}; then
+                        APPS_AVAILABLE+=("${app_name}")
+                        APPS_CHOSEN+=("0")
+                    fi
                 fi
             fi
         fi
@@ -356,16 +371,18 @@ function detect_installable_apps {
 
         if [[ $(enough_ram_for_app "$app_name") == "0" ]]; then
             if [[ $(app_not_on_onion_only "$app_name") != "0" ]]; then
-                # shellcheck disable=SC2068
-                if ! item_in_array "${app_name}" ${APPS_AVAILABLE[@]}; then
-                    variants_list=$(app_variants "$filename")
-                    # check for empty string
-                    if [ ${#variants_list} -gt 0 ]; then
-                        APPS_AVAILABLE+=("${app_name}")
-                        APPS_CHOSEN+=("0")
-                        APPS_INSTALLED+=("$(app_is_installed "$app_name")")
-                        if [[ $(app_is_installed "$app_name") == "1" ]]; then
-                            APPS_INSTALLED_NAMES+=("$app_name")
+                if [[ $(app_not_on_arm "$app_name") != "0" ]]; then
+                    # shellcheck disable=SC2068
+                    if ! item_in_array "${app_name}" ${APPS_AVAILABLE[@]}; then
+                        variants_list=$(app_variants "$filename")
+                        # check for empty string
+                        if [ ${#variants_list} -gt 0 ]; then
+                            APPS_AVAILABLE+=("${app_name}")
+                            APPS_CHOSEN+=("0")
+                            APPS_INSTALLED+=("$(app_is_installed "$app_name")")
+                            if [[ $(app_is_installed "$app_name") == "1" ]]; then
+                                APPS_INSTALLED_NAMES+=("$app_name")
+                            fi
                         fi
                     fi
                 fi
@@ -392,13 +409,15 @@ function detect_installed_apps {
 
         if [[ $(enough_ram_for_app "$app_name") == "0" ]]; then
             if [[ $(app_not_on_onion_only "$app_name") != "0" ]]; then
-                if [[ $(app_is_installed "$app_name") == "1" ]]; then
-                    # shellcheck disable=SC2068
-                    if ! item_in_array "${app_name}" ${APPS_AVAILABLE[@]}; then
-                        variants_list=$(app_variants "$filename")
-                        if [ ${#variants_list} -gt 0 ]; then
-                            APPS_AVAILABLE+=("${app_name}")
-                            APPS_INSTALLED_NAMES+=("$app_name")
+                if [[ $(app_not_on_arm "$app_name") != "0" ]]; then
+                    if [[ $(app_is_installed "$app_name") == "1" ]]; then
+                        # shellcheck disable=SC2068
+                        if ! item_in_array "${app_name}" ${APPS_AVAILABLE[@]}; then
+                            variants_list=$(app_variants "$filename")
+                            if [ ${#variants_list} -gt 0 ]; then
+                                APPS_AVAILABLE+=("${app_name}")
+                                APPS_INSTALLED_NAMES+=("$app_name")
+                            fi
                         fi
                     fi
                 fi
@@ -431,26 +450,28 @@ function choose_apps_for_variant {
         app_name=$(echo "${filename}" | awk -F '-app-' '{print $2}')
         if [[ $(enough_ram_for_app "$app_name") == "0" ]]; then
             if [[ $(app_not_on_onion_only "$app_name") != "0" ]]; then
-                # shellcheck disable=SC2068
-                if item_in_array "${app_name}" ${APPS_AVAILABLE[@]}; then
-                    if grep -q "VARIANTS=" "${filename}"; then
-                        variants_list=$(app_variants "$filename")
-                        if [[ "${variants_list}" == 'all'* || \
-                                  "${variants_list}" == "$variant_name" || \
-                                  "${variants_list}" == "$variant_name "* || \
-                                  "${variants_list}" == *" $variant_name "* || \
-                                  "${variants_list}" == *" $variant_name" ]]; then
-                            if [[ $(app_is_removed "${a}") == "0" ]]; then
-                                #echo $"${app_name} chosen"
-                                APPS_CHOSEN+=("1")
+                if [[ $(app_not_on_arm "$app_name") != "0" ]]; then
+                    # shellcheck disable=SC2068
+                    if item_in_array "${app_name}" ${APPS_AVAILABLE[@]}; then
+                        if grep -q "VARIANTS=" "${filename}"; then
+                            variants_list=$(app_variants "$filename")
+                            if [[ "${variants_list}" == 'all'* || \
+                                      "${variants_list}" == "$variant_name" || \
+                                      "${variants_list}" == "$variant_name "* || \
+                                      "${variants_list}" == *" $variant_name "* || \
+                                      "${variants_list}" == *" $variant_name" ]]; then
+                                if [[ $(app_is_removed "${a}") == "0" ]]; then
+                                    #echo $"${app_name} chosen"
+                                    APPS_CHOSEN+=("1")
+                                else
+                                    APPS_CHOSEN+=("0")
+                                fi
                             else
                                 APPS_CHOSEN+=("0")
                             fi
                         else
                             APPS_CHOSEN+=("0")
                         fi
-                    else
-                        APPS_CHOSEN+=("0")
                     fi
                 fi
             fi