Merge pull request #169 from pelican-dev/chore/updatePanel

updatePanel script Cleanup

Author: notAreYouScared

static/updatePanel.sh

@@ -5,13 +5,6 @@ if [[ $EUID -ne 0 ]]; then
    exit 1
 fi
 
-function exitInstall {
-  cd "$install_dir"
-  php artisan up
-  echo "Panel is out of maintenance mode."
-  exit $1
-}
-
 read -p "Enter the directory for the panel location [/var/www/pelican]: " install_dir
 install_dir=${install_dir:-/var/www/pelican}
 
@@ -35,15 +28,7 @@ group=$(stat -c '%G' "$install_dir" || echo "www-data")
 read -p "Enter the group of the files (www-data, apache, nginx) [$group]: " group
 group=${group:-www-data}
 
-cd "$install_dir"
-php artisan down
-if [ $? -ne 0 ]; then
-  echo "Failed to put the panel into maintenance mode."
-  exitInstall 1
-fi
-echo "Panel is now in maintenance mode."
-
-db_connection=$(grep "^DB_CONNECTION=" "$env_file" | cut -d '=' -f 2)
+db_connection=$(grep "^DB_CONNECTION=" "$env_file" | cut -d '=' -f 2 | tr -d "\"'")
 
 if [ -z "$db_connection" ]; then
   db_connection='sqlite'
@@ -56,29 +41,33 @@ read -p "Do you want to create a backup? (y/n) [y]: " backup_confirm
 backup_confirm=${backup_confirm:-y}
 if [ "$backup_confirm" != "y" ]; then
   echo "Backup canceled."
-  exitInstall 0
+  exit 1
 fi
 
 backup_dir="$install_dir/backup"
 mkdir -p "$backup_dir/storage/app"
+if [ $? -ne 0 ]; then
+  echo "Failed to create backup directory $backup_dir, aborting"
+  exit 1
+fi
 
 cp -a "$env_file" "$backup_dir/.env.backup"
 if [ $? -ne 0 ]; then
   echo "Failed to backup .env file, aborting"
-  exitInstall 1
+  exit 1
 fi
 echo "Backed up .env file successfully."
 
 if [ -d "$install_dir/storage/app/public" ]; then
   cp -a "$install_dir/storage/app/public" "$backup_dir/storage/app/"
   if [ $? -ne 0 ]; then
     echo "Failed to backup avatars & fonts files, aborting"
-    exitInstall 1
+    exit 1
   fi
 fi
 
 if [ "$db_connection" = "sqlite" ]; then
-  db_database=$(grep "^DB_DATABASE=" "$env_file" | cut -d '=' -f 2)
+  db_database=$(grep "^DB_DATABASE=" "$env_file" | cut -d '=' -f 2 | tr -d "\"'")
 
   if [ -z "$db_database" ]; then
     uses_default=true
@@ -97,14 +86,14 @@ if [ "$db_connection" = "sqlite" ]; then
   cp -a "$install_dir/database/$db_database" "$backup_dir/$db_database.backup"
   if [ $? -ne 0 ]; then
     echo "Failed to backup $db_database file, aborting"
-    exitInstall 1
+    exit 1
   fi
 else
   read -p "NOTE: THIS WILL NOT BACKUP MySQL/MariaDB DATABASES!!! You should pause now and make your own backup!! You've been warned! Continue? (y/n) [y]: " database_confirm
   database_confirm=${database_confirm:-y}
   if [ "$database_confirm" != "y" ]; then
     echo "Update Canceled."
-    exitInstall 0
+    exit 1
   fi
 fi
 
@@ -118,62 +107,50 @@ if [[ -z "$expected_checksum" || -z "$calculated_checksum" || "$expected_checksu
   checksum_confirm=${checksum_confirm:-y}
   if [ "$checksum_confirm" != "y" ]; then
     echo "Update Canceled."
-    exitInstall 1
+    exit 1
   fi
+else
+  echo "Checksum verified."
 fi
 
-echo "Checksum verified."
 read -p "Do you want to delete all files and folders in $install_dir except the backup folder? (y/n) [y]: " delete_confirm
 delete_confirm=${delete_confirm:-y}
 if [ "$delete_confirm" != "y" ]; then
   echo "Deletion canceled."
-  exitInstall 0
+  exit 1
 fi
 
-find "$install_dir" -mindepth 1 -maxdepth 1 ! -name 'backup' ! -name 'panel.tar.gz' ! -name 'artisan' -exec rm -rf {} +
+find "$install_dir" -mindepth 1 -maxdepth 1 ! -name 'backup' ! -name 'panel.tar.gz' -exec rm -rf {} +
 if [ $? -ne 0 ]; then
   echo "Failed to delete old files, aborting"
-  exitInstall 1
+  exit 1
 fi
 echo "Deleted all files and folders in $install_dir except the backup folder."
 
 echo "Extracting tarball."
 tar -xzf panel.tar.gz -C "$install_dir"
 if [ $? -ne 0 ]; then
   echo "Failed to extract tarball, aborting"
-  exitInstall 1
+  exit 1
 fi
 rm panel.tar.gz
 if [ $? -ne 0 ]; then
   echo "Failed to delete leftover tarball, continuing."
 fi
 
-echo "Installing Composer"
-COMPOSER_ALLOW_SUPERUSER=1 composer install --no-dev --optimize-autoloader --no-interaction
-if [ $? -ne 0 ]; then
-  echo "Failed to run composer, aborting"
-  exitInstall 1
-fi
-
-php artisan down
-if [ $? -ne 0 ]; then
-  echo "Failed to put the panel into maintenance mode."
-  exitInstall 1
-fi
-
 echo "Restoring .env"
 cp -a "$backup_dir/.env.backup" "$install_dir/.env"
 if [ $? -ne 0 ]; then
   echo "Failed to restore the .env file, aborting"
-  exitInstall 1
+  exit 1
 fi
 
 if [ -d "$backup_dir/storage/app/public" ]; then
   echo "Restoring avatars & fonts"
   cp -a "$backup_dir/storage/app/public" "$install_dir/storage/app/"
   if [ $? -ne 0 ]; then
     echo "Failed to restore avatars & fonts files, aborting"
-    exitInstall 1
+    exit 1
   fi
 fi
 
@@ -182,10 +159,19 @@ if [ -f "$backup_dir/$db_database.backup" ]; then
   cp -a "$backup_dir/$db_database.backup" "$install_dir/database/$db_database"
   if [ $? -ne 0 ]; then
     echo "Failed to restore the database, aborting"
-    exitInstall 1
+    exit 1
   fi
 fi
 
+cd $install_dir
+
+echo "Installing Composer"
+COMPOSER_ALLOW_SUPERUSER=1 composer install --no-dev --optimize-autoloader --no-interaction
+if [ $? -ne 0 ]; then
+  echo "Failed to run composer, aborting"
+  exit 1
+fi
+
 echo "Optimizing"
 php artisan optimize:clear
 php artisan filament:optimize
@@ -211,8 +197,6 @@ if [ $? -ne 0 ]; then
 fi
 
 php artisan queue:restart
-php artisan up
 
-echo "Panel is now live and out of maintenance mode."
 echo "Panel Updated!"
 exit 0