nc-autoupdate-nc: Optionally prevent update if NC apps are incompatible

Author: theCalcaholic

bin/ncp-update-nc

@@ -22,6 +22,11 @@ set -eE${DBG}
 BIN="${0##*/}"
 VER="$1"
 [[ "$VER" == "" ]] && { echo "Usage ${BIN} <version>"; exit 1; }
+extra_args=()
+if [[ " $* " =~ " "--allow-incompatible-apps" " ]]
+then
+  extra_args+=(--allow-incompatible-apps)
+fi
 
 connect_to_nc_update() {
   tail -n 100 -f "/var/log/ncp-update-nc.log" &
@@ -54,7 +59,7 @@ fi
 
 systemctl reset-failed ncp-update-nc 2>/dev/null ||:
 systemd-run -u 'ncp-update-nc' --service-type=oneshot --no-block -p TimeoutStartSec="24h" -p TimeoutStopSec="1h" \
-  bash -c "set -o pipefail; DBG='${DBG:-}' /usr/local/bin/ncp-update-nc.d/update-nc.sh '${VER}' |& tee /var/log/ncp-update-nc.log"
+  bash -c "set -o pipefail; DBG='${DBG:-}' /usr/local/bin/ncp-update-nc.d/update-nc.sh '${VER}' ${extra_args[*]} |& tee /var/log/ncp-update-nc.log"
 sleep 1
 
 if ! [[ "$(systemctl is-active ncp-update-nc ||:)" =~ ^(active|inactive|activating|deactivating)$ ]]

bin/ncp-update-nc.d/update-nc.sh

@@ -94,6 +94,27 @@ URL="https://download.nextcloud.com/server/releases/nextcloud-$TARGET_VERSION.ta
 echo "Download Nextcloud $TARGET_VERSION..."
 wget -q "$URL" -O nextcloud.tar.bz2 || { echo "Error downloading"; exit 1; }
 
+# Check if installed apps are compatible
+server_apps="$(tar -tf nextcloud.tar.bz2 --exclude='nextcloud/apps/*/*' | grep '^nextcloud/apps' | sed -e 's|^nextcloud/apps/||g' -e 's|/$||g')"
+compatible_apps="$(curl "https://apps.nextcloud.com/api/v1/platform/$TARGET_VERSION/apps.json" | jq '.[].id' -r)"
+enabled_apps="$(ncc app:list --output json | jq '.enabled | keys | .[]' -r)"
+
+incompatible="$(comm -2 -3 <( echo "${enabled_apps?}" | sort ) <( { echo "${compatible_apps?}"; echo "${server_apps?}"; echo "nextcloudpi"; } | sort ))"
+
+if [[ -n "$incompatible" ]]
+then
+  if [[ " ${*} " =~ " "--allow-incompatible-apps" " ]]
+  then
+    echo "WARNING: The following apps are incompatible with the new Nextcloud version and will be disabled (update is running with --allow-incompatible-apps):"
+    echo "$incompatible"
+  else
+    echo "ERROR: Some installed apps are incompatible with the new Nextcloud version. Aborting update (run with --allow-incompatible-apps to ignore this)."
+    echo "Incompatible apps:"
+    echo "$incompatible"
+    exit 1
+  fi
+fi
+
 # backup
 ####################
 BKPDIR="$BASEDIR"

bin/ncp/CONFIG/nc-previews-auto.sh

@@ -33,7 +33,7 @@ configure()
   ncc config:app:set --value=0 --type=integer previewgenerator job_max_previews
 
   mkdir -p /etc/cron.hourly
-  install_template cron.hourly/ncp-previewgenerator /etc/cron.hourly/ncp-previewgenerator
+  install_template cron.hourly/ncp-previewgenerator.sh /etc/cron.hourly/ncp-previewgenerator
   chmod +x /etc/cron.hourly/ncp-previewgenerator
   echo "Automatic preview generation enabled"
   return 0

bin/ncp/UPDATES/nc-autoupdate-nc.sh

@@ -10,6 +10,19 @@
 
 # just change NCLATESTVER and re-activate in update.sh to upgrade users
 
+tmpl_ncp_update_nc_args() {
+
+  CHECK_INCOMPATIBLE_APPS="$(
+    . /usr/local/etc/library.sh
+    find_app_param nc-autoupdate-nc CHECK_INCOMPATIBLE_APPS
+  )"
+  if [[ "${CHECK_INCOMPATIBLE_APPS:-yes}" != "yes" ]]
+  then
+    echo "--allow-incompatible-apps"
+  fi
+
+}
+
 configure()
 {
   [[ "$ACTIVE" != "yes" ]] && {
@@ -18,21 +31,7 @@ configure()
     return 0
   }
 
-  cat > /etc/cron.daily/ncp-autoupdate-nc <<EOF
-#!/bin/bash
-source /usr/local/etc/library.sh
-
-echo -e "[ncp-update-nc]"                              >> /var/log/ncp.log
-/usr/local/bin/ncp-update-nc "latest" 2>&1 | tee -a /var/log/ncp.log
-
-if [[ \${PIPESTATUS[0]} -eq 0 ]]; then
-
-  VER="\$(nc_version)"
-
-  notify_admin "NextCloudPi" "Nextcloud was updated to \$VER"
-fi
-echo "" >> /var/log/ncp.log
-EOF
+  install_template cron.daily/ncp-autoupdate-nc.sh "/etc/cron.daily/ncp-autoupdate-nc"
   chmod 755 /etc/cron.daily/ncp-autoupdate-nc
   echo "automatic Nextcloud updates enabled"
 }

bin/ncp/UPDATES/nc-update-nextcloud.sh

@@ -12,7 +12,12 @@ LATEST="$NCLATESTVER"
 
 configure()
 {
-  bash /usr/local/bin/ncp-update-nc "$VERSION"
+  extra_args=()
+  if [[ "${CHECK_INCOMPATIBLE_APPS:-yes}" != "yes" ]]
+  then
+    extra_args+=(--allow-incompatible-apps)
+  fi
+  bash /usr/local/bin/ncp-update-nc "$VERSION" "${extra_args[@]}"
 }
 
 install() { :; }

etc/ncp-config.d/nc-autoupdate-nc.cfg

@@ -11,6 +11,12 @@
       "name": "Active",
       "value": "no",
       "type": "bool"
+    },
+    {
+      "id": "CHECK_INCOMPATIBLE_APPS",
+      "name": "Check for incompatible apps",
+      "value": "yes",
+      "type": "bool"
     }
   ]
 }

etc/ncp-config.d/nc-update-nextcloud.cfg

@@ -11,6 +11,12 @@
       "name": "Version",
       "value": "0",
       "suggest": "0"
+    },
+    {
+      "id": "CHECK_INCOMPATIBLE_APPS",
+      "name": "Check for incompatible apps",
+      "value": "yes",
+      "type": "bool"
     }
   ]
 }

etc/ncp-templates/cron.daily/ncp-autoupdate-nc.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+set -e
+set +u
+source /usr/local/etc/library.sh
+
+ncp_update_nc_args=""
+if [[ "$1" != "--defaults" ]]
+then
+  ncp_update_nc_args="$(
+    source "${BINDIR}/UPDATES/nc-autoupdate-nc.sh"
+    tmpl_ncp_update_nc_args
+  )"
+fi
+
+cat <<EOF
+#!/bin/bash
+source /usr/local/etc/library.sh
+
+echo -e "[ncp-update-nc]"                                    >> /var/log/ncp.log
+/usr/local/bin/ncp-update-nc ${ncp_update_nc_args} "latest" 2>&1 | tee -a /var/log/ncp.log
+
+if [[ \${PIPESTATUS[0]} -eq 0 ]]; then
+
+  VER="\$(nc_version)"
+
+  notify_admin "NextCloudPi" "Nextcloud was updated to \$VER"
+fi
+echo "" >> /var/log/ncp.log
+EOF

…mplates/cron.hourly/ncp-previewgenerator …ates/cron.hourly/ncp-previewgenerator.shetc/ncp-templates/cron.hourly/ncp-previewgenerator renamed to etc/ncp-templates/cron.hourly/ncp-previewgenerator.sh etc/ncp-templates/cron.hourly/ncp-previewgenerator renamed to etc/ncp-templates/cron.hourly/ncp-previewgenerator.sh

@@ -17,6 +17,11 @@ install_template nextcloud.conf.sh /etc/apache2/sites-available/001-nextcloud.co
 }
 systemctl reload apache2
 
+if is_active_app nc-autoupdate-nc
+then
+  run_app nc-autoupdate-nc
+fi
+
 if [[ -L /var/www/nextcloud/apps/previewgenerator ]]
 then
   echo "Removing custom version of previewgenerator app ..."