From 8be3c1aaf23a2754ebcf357eaa2c482f2b4b1212 Mon Sep 17 00:00:00 2001 From: Jeremy Price Date: Thu, 11 Jan 2024 18:20:09 -0800 Subject: [PATCH] Quit the script when we hit hard errors a found a few other points where we talk about exiting and re-running the script once fixed, but never actually exit. So i'm adding-in the missing exits, and updating any existing exits to make sure we return a failing return code to the shell --- upgrade.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/upgrade.php b/upgrade.php index 7f98211143..dc03797954 100644 --- a/upgrade.php +++ b/upgrade.php @@ -149,7 +149,7 @@ if ($env_bad !='') { echo "!!!!!!!!!!!!!!!!!!!!!!!!! ABORTING THE UPGRADER !!!!!!!!!!!!!!!!!!!!!!\n"; echo "Please correct the issues above in ".getcwd()."/.env and try again.\n"; echo "--------------------------------------------------------\n"; - exit; + exit(1); } @@ -168,7 +168,7 @@ if ((version_compare(phpversion(), $php_min_works, '>=')) && (version_compare(ph echo "Snipe-IT requires PHP versions between ".$php_min_works." and ".$php_max_wontwork.".\n"; echo "Please install a compatible version of PHP and re-run this script again. \n"; echo "!!!!!!!!!!!!!!!!!!!!!!!!! ABORTING THE UPGRADER !!!!!!!!!!!!!!!!!!!!!!\n"; - exit; + exit(1); } echo "Checking Required PHP extensions... \n\n"; @@ -256,7 +256,7 @@ if ($ext_missing!='') { echo "ABORTING THE INSTALLER \n"; echo "Please install the extensions above and re-run this script.\n"; echo "--------------------------------------------------------\n"; - exit; + exit(1); } else { echo $ext_installed."\n"; @@ -311,6 +311,7 @@ if ($dirs_not_writable!='') { echo "--------------------- !! ERROR !! ----------------------\n"; echo "Please check the permissions on the directories above and re-run this script.\n"; echo "------------------------- :( ---------------------------\n\n"; + exit(1); }