feat: maybe functional??

Author: prplwtf

blueprint.sh

@@ -255,9 +255,9 @@ if [[ $1 != "-bash" ]]; then
       echo -e "\x1b[30;41;1m YOU ARE USING THE LEGACY UPDATER!! \x1b[0m"
       echo -e "\n\x1b[31;49;1mPlease rerun 'blueprint -upgrade' to continue the update process. This is NOT A BUG.\nPress ENTER to continue back to legacy updater (will fail) or ^C to terminate the process.\x1b[0m"
 
-      echo -e "\n1. Terminate this process with CTRL+C (^C)"
-      echo -e "2. Run 'blueprint -upgrade'"
-      echo -e "3. Blueprint will update to the latest version."
+      echo -e "\n\x1b[31;49m1. Terminate this process with CTRL+C (^C)\x1b[0m"
+      echo -e "\n\x1b[31;49m2. Run 'blueprint -upgrade'\x1b[0m"
+      echo -e "\n\x1b[31;49m3. Blueprint will update to the latest version.\x1b[0m"
 
       read -r
       exit 1

scripts/commands/advanced/upgrade.sh

@@ -12,22 +12,35 @@ Command() {
   update_choice=""
 
   # Initial steps count for progress bar
-  export PROGRESS_TOTAL=10
+  export PROGRESS_TOTAL=7
   export PROGRESS_NOW=0
 
   # Make sure the script is in $FOLDER
   cd "$FOLDER" || exit 1
 
+  # Export the repository variables
+  export remote_repo
+  export remote_branch
+  export fetched_version
+
   # Create temporary directory for upgrade files
   PRINT INFO "Creating .update directory.."
   mkdir -p .update
 
-  # Define cleanup for this step
+  # Define cleanup
   cleanup() {
+    PRINT INFO "Cleaning up.."
     cd "$FOLDER" || exit 1
+
+    if [[ $development_files == true ]]; then
+      PRINT INFO "Restoring extension development files.."
+      rm -rf .blueprint/dev
+      mv .update/backup/dev .blueprint/dev
+    fi
     rm -rf .update
 
     if [[ $1 != "" ]]; then
+      hide_progress
       exit "$1"
     fi
   }
@@ -83,12 +96,23 @@ Command() {
     esac
   else
     PRINT DEBUG "\$1 was NOT 'remote' (it was '$1')"
+    PRINT INFO "Fetching version info"
+
+    php artisan bp:version:cache 2> $BLUEPRINT__DEBUG
+    tag_latest=$(php artisan bp:version:latest)
+    PRINT DEBUG "tag_latest is $tag_latest"
+
+    fetched_version="$tag_latest"
+    remote_repo="https://github.com/$REPOSITORY.git"
+    remote_branch="release/$tag_latest"
+    PRINT DEBUG "set remote_repo to '$remote_repo', remote_branch to '$remote_branch'"
   fi
 
   ((PROGRESS_NOW++))
 
   # Fetching repository with git
   PRINT INFO "Downloading repository.."
+  hide_progress
   git clone "$remote_repo" .update/repo --branch "$remote_branch"
 
   if [[ ! -d ".update/repo" ]]; then
@@ -98,7 +122,60 @@ Command() {
 
   ((PROGRESS_NOW++))
 
+  # Determine and backup development files
+  development_files=false
+  if [[ -n $(find .blueprint/dev -maxdepth 1 -type f -not -name ".gitkeep" -print -quit) ]]; then
+    development_files=true
+    PRINT INFO "Backing up extension development files.."
+    mkdir -p .update/backup
+    cp -Rf .blueprint/dev .update/backup/dev
+  fi
+
+  ((PROGRESS_NOW++))
+
+  # Delete files
+  PRINT INFO "Deleting files.."
+  rm -rf .blueprint
+
+  # Clean up folders with potentially broken symlinks.
+  rm \
+    "resources/views/blueprint/admin/wrappers/"* \
+    "resources/views/blueprint/dashboard/wrappers/"* \
+    "routes/blueprint/application/"* \
+    "routes/blueprint/client/"* \
+    "routes/blueprint/web/"* \
+    &>> /dev/null # cannot forward to debug dir because it does not exist
+
+  ((PROGRESS_NOW++))
+
   # Run update script
   PRINT INFO "Running update script.."
-  bash .update/repo
+  source .update/repo/scripts/updater/update.sh
+  hide_progress
+  UpdaterInstall
+
+  ((PROGRESS_NOW++))
+
+  # Deprecated, kept in for backwards compatibility
+  sed -i -E \
+    -e "s|OWNERSHIP=\"www-data:www-data\" #;|OWNERSHIP=\"$OWNERSHIP\" #;|g" \
+    -e "s|WEBUSER=\"www-data\" #;|WEBUSER=\"$WEBUSER\" #;|g" \
+    -e "s|USERSHELL=\"/bin/bash\" #;|USERSHELL=\"$USERSHELL\" #;|g" \
+    blueprint.sh
+
+  # Run install script
+  PRINT INFO "Running final install script.."
+  chmod +x blueprint.sh
+  mv "$FOLDER/blueprint" "$FOLDER/.blueprint"
+  hide_progress
+  BLUEPRINT_ENVIRONMENT="upgrade2" PROGRESS_NOW="$PROGRESS_NOW" PROGRESS_TOTAL="$PROGRESS_TOTAL" bash blueprint.sh
+
+  ((PROGRESS_NOW++))
+
+  cleanup
+
+  # Tell user that update has finished
+  PRINT SUCCESS "Update finished!"
+  hide_progress
+  exit 0
 }

scripts/commands/advanced/upgrade_old.sh

@@ -79,25 +79,6 @@ Command() {
 
   ((PROGRESS_NOW++))
 
-  PRINT INFO "Running updater.."
-
-  NEW_TAG="$TAG_NAME" \
-  OLD_TAG="$VERSION" \
-  RAN_BY_LEGACY=false \
-  UPDATE_FOLDER="$FOLDER/.tmp/files/update" \
-  PROGRESS_NOW="$PROGRESS_NOW" \
-  PROGRESS_TOTAL="$PROGRESS_TOTAL" \
-  FOLDER="$FOLDER" \
-  REPOSITORY="$REPOSITORY" \
-  BLUEPRINT_ENGINE="$BLUEPRINT_ENGINE" \
-  OWNERSHIP="$OWNERSHIP" \
-  WEBUSER="$WEBUSER" \
-  USERSHELL="$USERSHELL" \
-  BLUEPRINT__DEBUG="$BLUEPRINT__DEBUG" \
-  bash update/scripts/helpers/preupdate.sh
-
-  ((PROGRESS_NOW++))
-
   if [[ ! -d "update" ]]; then
     PRINT DEBUG "update directory not found.. exiting"
     cd "$FOLDER" || cdhalt

scripts/updater/update.sh

@@ -1,20 +1,13 @@
 #!/bin/bash
 
-# $NEW_TAG: New Blueprint version that update.sh is updating to
-# $OLD_TAG: Old Blueprint version that update.sh is updating from
-# $RAN_BY_LEGACY: If this script is ran by the legacy updater
-# $UPDATE_FOLDER: Folder with the update files
-# $PROGRESS_NOW: Current loader progress
-# $PROGRESS_TOTAL: Total loader progress
-
-# $FOLDER: Pterodactyl directory
-# $REPOSITORY: GitHub repository
-# $BLUEPRINT_ENGINE: Blueprint engine name
-# $OWNERSHIP: Group that owns the Pterodactyl directory permissions
-# $WEBUSER: User that owns the Pterodactyl directory permissions
-# $USERSHELL: The shell used for extension scripts and stuff
-# $BLUEPRINT__DEBUG: Blueprint debug directory for debug logs
-
-source ../libraries/logFormat.sh || echo "could not import logformat"
-
-exit 0
+UpdaterInstall() {
+  # Copy release files to Pterodactyl directory
+  PRINT INFO "Copying release files to Pterodactyl directory.."
+  cp -r .update/repo/* .
+  cp .eslintrc.js .
+  cp .prettierignore .
+  cp .prettierrc.json .
+  cp .shellcheckrc .
+
+  exit 0
+}