From ae98c9a4edaae862b0e2b54fcd81b12aacfe2f49 Mon Sep 17 00:00:00 2001
From: seyuf <seyuf@hotmail.com>
Date: Thu, 2 Feb 2023 13:53:11 +0100
Subject: [PATCH] fixes #43 #44

---
 scripts/deploy-production.sh | 8 +-------
 scripts/deploy-staging.sh    | 7 +------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/scripts/deploy-production.sh b/scripts/deploy-production.sh
index f53bd9b..04270b6 100644
--- a/scripts/deploy-production.sh
+++ b/scripts/deploy-production.sh
@@ -1,10 +1,9 @@
 #!/bin/bash
 
-#set -e
+set -e
 
 PROJECT_PATH="$(pwd)"
 
-
 echo "project path is $PROJECT_PATH";
 
 which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )
@@ -13,13 +12,10 @@ mkdir ~/.ssh/ && echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_
 ssh-add ~/.ssh/id_rsa
 echo "$SSH_CONFIG" > /etc/ssh/ssh_config && chmod 600 /etc/ssh/ssh_config
 
-
-
 echo "Create artifact and send to server"
 
 cd $PROJECT_PATH
 
-
 echo "Deploying to production server";
 
 mkdir -p deployer/scripts/
@@ -33,11 +29,9 @@ ARCHIVES="deployer/scripts/production"
 [ -d "pwa-studio" ] && ARCHIVES="$ARCHIVES pwa-studio"
 [ -d "magento" ] && ARCHIVES="$ARCHIVES magento"
 
-
 tar cfz "$BUCKET_COMMIT" $ARCHIVES
 scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null  "$BUCKET_COMMIT" production:$HOST_DEPLOY_PATH_BUCKET
 
-
 cd /opt/config/php-deployer
 
 echo 'Deploying production ...';
diff --git a/scripts/deploy-staging.sh b/scripts/deploy-staging.sh
index b99e85a..ab81ef6 100644
--- a/scripts/deploy-staging.sh
+++ b/scripts/deploy-staging.sh
@@ -1,10 +1,9 @@
 #!/bin/bash
 
-#set -e
+set -e
 
 PROJECT_PATH="$(pwd)"
 
-
 echo "project path is $PROJECT_PATH";
 
 which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )
@@ -13,8 +12,6 @@ mkdir ~/.ssh/ && echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_
 ssh-add ~/.ssh/id_rsa
 echo "$SSH_CONFIG" > /etc/ssh/ssh_config && chmod 600 /etc/ssh/ssh_config
 
-
-
 echo "Create artifact and send to server"
 
 cd $PROJECT_PATH
@@ -42,7 +39,6 @@ cd /opt/config/php-deployer
 
 echo 'Deploying staging ...';
 
-
 echo '------> Deploying bucket ...';
 # deploy bucket
 php7.4 ./vendor/bin/dep deploy-bucket staging \
@@ -79,7 +75,6 @@ php7.4 ./vendor/bin/dep $DEFAULT_DEPLOYER staging \
 -o write_use_sudo=$WRITE_USE_SUDO
 
 echo "running magento and/or pwa deployer"
-
 if [ -d "$PROJECT_PATH/magento" ]
 then
   ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null  staging "cd $HOST_DEPLOY_PATH/current/magento/ && /bin/bash $HOST_DEPLOY_PATH/deployer/scripts/staging/post_release_setup.sh"