update script

Author: JoshKisb

update-repositories.sh

@@ -2,12 +2,12 @@
 
 PROJECTS_DIR="$HOME/projects/liberu"
 BOILERPLATE_DIR="$PROJECTS_DIR/boilerplate-laravel"
-LOG_FILE="$HOME/update-projects.log"
+LOG_FILE="$PROJECTS_DIR/update-projects.log"
 TIMESTAMP=$(date "+%Y-%m-%d %H:%M:%S")
 
 echo "===== Starting update: $TIMESTAMP =====" | tee -a "$LOG_FILE"
 
-# List of repos to update
+# List of repositories to update
 REPOS=(
     "ecommerce-laravel"
     "browser-game-laravel"
@@ -29,55 +29,72 @@ REPOS=(
 for repo in "${REPOS[@]}"; do
     TARGET_DIR="$PROJECTS_DIR/$repo"
 
-    if [ -d "$TARGET_DIR/.git" ]; then
-        echo "----- Processing $repo -----" | tee -a "$LOG_FILE"
-        cd "$TARGET_DIR" || { echo "Failed to enter $TARGET_DIR" | tee -a "$LOG_FILE"; continue; }
-
-        {
-            echo "Pulling latest changes from origin..."
-            git pull || { echo "git pull failed in $repo"; continue; }
-
-            # --- Composer updates ---
-            if [ -f composer.json ]; then
-                echo "Running composer update..."
-                composer update || { echo "composer update failed in $repo"; continue; }
-            fi
-
-            # --- NPM updates ---
-            if [ -f package.json ]; then
-                echo "Running npm install..."
-                npm install || { echo "npm install failed in $repo"; continue; }
-
-                echo "Running npm upgrade..."
-                npm upgrade || { echo "npm upgrade failed in $repo"; continue; }
-
-                echo "Running npm audit fix..."
-                npm audit fix --force || { echo "npm audit fix failed in $repo"; continue; }
+    if [ ! -d "$TARGET_DIR/.git" ]; then
+        echo "Skipping $repo - not a git repo" | tee -a "$LOG_FILE"
+        continue
+    fi
 
-                echo "Running npm run build..."
-                npm run build || { echo "npm run build failed in $repo"; continue; }
-            fi
+    echo "----- Processing $repo -----" | tee -a "$LOG_FILE"
+    cd "$TARGET_DIR" || { echo "Failed to enter $TARGET_DIR" | tee -a "$LOG_FILE"; continue; }
 
-            # --- Placeholder for custom updates ---
-            # Example: Copy boilerplate files
-            # cp -r "$PROJECTS_DIR/boilerplate-laravel/app/." "$TARGET_DIR/app/"
-            # cp -r "$PROJECTS_DIR/boilerplate-laravel/config/." "$TARGET_DIR/config/"
+    # Pull latest changes
+    echo "Pulling latest changes from origin..."
+    if ! git pull; then
+        echo "git pull failed in $repo" | tee -a "$LOG_FILE"
+        continue
+    fi
 
-            # --- Commit any automatic changes ---
-            if ! git diff --quiet || ! git diff --cached --quiet; then
-                echo "Committing and pushing changes..."
-                git add -A
-                git commit -m "Update dependencies and boilerplate changes" || true
-                git push || { echo "git push failed in $repo"; continue; }
-            else
-                echo "No changes to commit"
-            fi
+    # --- Composer updates ---
+    if [ -f composer.json ]; then
+        echo "Running composer update..."
+        if ! composer update; then
+            echo "composer update failed in $repo" | tee -a "$LOG_FILE"
+            continue
+        fi
+    fi
 
-        } 2>&1 | tee -a "$LOG_FILE"
+    # --- NPM updates ---
+    if [ -f package.json ]; then
+        echo "Running npm install..."
+        if ! npm install; then
+            echo "npm install failed in $repo" | tee -a "$LOG_FILE"
+            continue
+        fi
+
+        echo "Running npm upgrade..."
+        if ! npm upgrade; then
+            echo "npm upgrade failed in $repo" | tee -a "$LOG_FILE"
+            continue
+        fi
+
+        echo "Running npm audit fix..."
+        if ! npm audit fix --force; then
+            echo "npm audit fix failed in $repo" | tee -a "$LOG_FILE"
+            continue
+        fi
+
+        echo "Running npm run build..."
+        if ! npm run build; then
+            echo "npm run build failed in $repo" | tee -a "$LOG_FILE"
+            continue
+        fi
+    fi
 
+    # --- Placeholder for custom updates ---
+    # Example: Copy selective boilerplate files
+    # cp -r "$PROJECTS_DIR/boilerplate-laravel/app/." "$TARGET_DIR/app/"
+    # cp -r "$PROJECTS_DIR/boilerplate-laravel/config/." "$TARGET_DIR/config/"
+
+    # Commit & push any changes
+    if ! git diff --quiet || ! git diff --cached --quiet; then
+        echo "Committing and pushing changes..."
+        git add -A
+        git commit -m "Update dependencies and boilerplate changes" || true
+        git push || { echo "git push failed in $repo"; continue; }
     else
-        echo "Skipping $repo - not a git repo" | tee -a "$LOG_FILE"
+        echo "No changes to commit"
     fi
+
 done
 
 echo "===== Update completed: $(date "+%Y-%m-%d %H:%M:%S") =====" | tee -a "$LOG_FILE"