From fc0914c8ecfd14c2b0c9b68bd27b491da8d9cb74 Mon Sep 17 00:00:00 2001
From: Petar Basic <petar.basic@uns.ac.rs>
Date: Tue, 18 Mar 2025 17:14:31 +0100
Subject: [PATCH] LDCL-14: Improve error handling in phapp scripts.

---
 phapp.yml | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/phapp.yml b/phapp.yml
index aea44a7f4..5d3c7558c 100644
--- a/phapp.yml
+++ b/phapp.yml
@@ -25,28 +25,31 @@ commands:
   status: |
     drush status --fields=bootstrap | grep 'bootstrap' -q
   init: |
-    ./scripts/init-media-icons.sh &&
-    drush sql-create -y &&
-    zcat dumps/init.sql.gz | drush sql:cli &&
-    drush updatedb -y &&
+    set -e
+    ./scripts/init-media-icons.sh
+    drush sql-create -y
+    zcat dumps/init.sql.gz | drush sql:cli
+    drush updatedb -y
     # Skip config-import when there is no config.
     if [ -f config/sync/core.extension.yml ]; then
       drush phapp:apply-env-mode && drush cim -y && drush cr
-    fi &&
-    drush deploy:hook -y &&
+    fi
+    drush deploy:hook -y
     drush locale:check && drush locale:update
   install: |
-    ./scripts/init-media-icons.sh &&
-    chmod +w web/sites/default &&
-    drush sql-create -y &&
-    SITE=${SITE:-default} &&
+    set -e
+    ./scripts/init-media-icons.sh
+    chmod +w web/sites/default
+    drush sql-create -y
+    SITE=${SITE:-default}
     drush site-install -y --sites-subdir=$SITE --config-dir=../config/sync ${INSTALL_PROFILE:-minimal}
   update: |
-    ./scripts/init-media-icons.sh &&
-    drush updatedb -y &&
+    set -e
+    ./scripts/init-media-icons.sh
+    drush updatedb -y
     # Skip config-import when there is no config.
     if [ -f config/sync/core.extension.yml ]; then
       drush phapp:apply-env-mode && drush cim -y && drush cr
-    fi &&
-    drush deploy:hook -y &&
+    fi
+    drush deploy:hook -y
     drush locale:check && drush locale:update