bin/ncp-dist-upgrade*: Move prompt to launch script (so it happens outside of tmux).

Author: theCalcaholic

bin/ncp-dist-upgrade

@@ -9,6 +9,29 @@ set -e
 
 . /etc/os-release
 
+new_cfg=/usr/local/etc/ncp-recommended.cfg
+[[ -f "${new_cfg}" ]] || { echo "Already on the latest recommended distribution. Abort." >&2; exit 1; }
+
+echo "
+>>> ATTENTION <<<
+This is a dangerous process that is only guaranteed to work properly if you
+have not made manual changes in the system. Backup the SD card first and
+proceed at your own risk.
+
+Note that this is not a requirement for NCP to continue working properly.
+The current distribution will keep receiving updates for some time.
+
+Do you want to continue? [y/N]"
+
+if [[ "${DEBIAN_FRONTEND:-}" == "noninteractive" ]] || ! [[ -t 0 ]]
+then
+  echo "Noninteractive environment detected. Automatically proceeding in 30 seconds..."
+  sleep 30
+else
+  read -n1 -r key
+  [[ "${key,,}" == y ]] || exit 0
+fi
+
 if [[ "$VERSION_ID" -eq 10 ]]
 then
   UPGRADE_CMD=(bash /usr/local/bin/ncp-dist-upgrade.d/debian-10.sh)

bin/ncp-dist-upgrade.d/debian-10.sh

@@ -4,26 +4,6 @@ set -eu -o pipefail
 
 [[ -f /.dockerenv ]] && { echo "Not supported in Docker. Upgrade the container instead"; exit 0; }
 
-new_cfg=/usr/local/etc/ncp-recommended.cfg
-[[ -f "${new_cfg}" ]] || { echo "Already on the lastest recommended distribution. Abort." >&2; exit 1; }
-
-APTINSTALL="apt-get install -y --no-install-recommends"
-export DEBIAN_FRONTEND=noninteractive
-
-echo "
->>> ATTENTION <<<
-This is a dangerous process that is only guaranteed to work properly if you
-have not made manual changes in the system. Backup the SD card first and
-proceed at your own risk.
-
-Note that this is not a requirement for NCP to continue working properly.
-The current distribution will keep receiving updates for some time.
-
-Do you want to continue? [y/N]"
-
-read key
-[[ "$key" == y ]] || exit 0
-
 source /usr/local/etc/library.sh # sets NCPCFG RELEASE PHPVER
 old_cfg="${NCPCFG}"
 

bin/ncp-dist-upgrade.d/debian-11.sh

@@ -2,29 +2,6 @@
 
 set -eu -o pipefail
 
-new_cfg=/usr/local/etc/ncp-recommended.cfg
-[[ -f "${new_cfg}" ]] || { echo "Already on the lastest recommended distribution. Abort." >&2; exit 1; }
-
-echo "
->>> ATTENTION <<<
-This is a dangerous process that is only guaranteed to work properly if you
-have not made manual changes in the system. Backup the SD card first and
-proceed at your own risk.
-
-Note that this is not a requirement for NCP to continue working properly.
-The current distribution will keep receiving updates for some time.
-
-Do you want to continue? [y/N]"
-
-if [[ "${DEBIAN_FRONTEND:-}" == "noninteractive" ]] || ! [[ -t 0 ]]
-then
-  echo "Noninteractive environment detected. Automatically proceeding in 30 seconds..."
-  sleep 30
-else
-  read -n1 -r key
-  [[ "${key,,}" == y ]] || exit 0
-fi
-
 export DEBIAN_FRONTEND=noninteractive
 
 source /usr/local/etc/library.sh

bin/ncp-dist-upgrade.d/debian-12.sh

@@ -2,29 +2,6 @@
 
 set -eu -o pipefail
 
-new_cfg=/usr/local/etc/ncp-recommended.cfg
-[[ -f "${new_cfg}" ]] || { echo "Already on the latest recommended distribution. Abort." >&2; exit 1; }
-
-echo "
->>> ATTENTION <<<
-This is a dangerous process that is only guaranteed to work properly if you
-have not made manual changes in the system. Backup the SD card first and
-proceed at your own risk.
-
-Note that this is not a requirement for NCP to continue working properly.
-The current distribution will keep receiving updates for some time.
-
-Do you want to continue? [y/N]"
-
-if [[ "${DEBIAN_FRONTEND:-}" == "noninteractive" ]] || ! [[ -t 0 ]]
-then
-  echo "Noninteractive environment detected. Automatically proceeding in 30 seconds..."
-  sleep 30
-else
-  read -n1 -r key
-  [[ "${key,,}" == y ]] || exit 0
-fi
-
 export DEBIAN_FRONTEND=noninteractive
 
 source /usr/local/etc/library.sh