From 81890b657004ebfed45db139c15a22282d1a683b Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Mon, 20 Aug 2018 23:21:02 +0200
Subject: Build docker image with gitlab

---
 deploy.sh | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'deploy.sh')

diff --git a/deploy.sh b/deploy.sh
index b731e36a..15795011 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -60,14 +60,11 @@ ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "${remote_hos
     if [[ -f \"${remote_path}/current/config/config.php\" ]]; then
         echo \"Config backup\"
         cp \"${remote_path}/current/config/config.php\" \"${deploy_id}-config.php\"
-    fi
-
-    echo \"Changing symlink\"
-    unlink_cmd=\$(command -v unlink || command -v rm)
-    \$unlink_cmd \"${remote_path}/current\" && ln -s \"${remote_path}/${deploy_id}\" \"${remote_path}/current\"
 
-    if [[ -f \"${deploy_id}-config.php\" ]]; then
         echo \"Restoring config\"
-        cp  \"${deploy_id}-config.php\" \"${remote_path}/current/config/config.php\"
+        cp  \"${deploy_id}-config.php\" \"${remote_path}/${deploy_id}/config/config.php\"
     fi
+
+    echo \"Changing symlink\"
+    ln -nsf \"${remote_path}/${deploy_id}\" \"${remote_path}/current\"
 "
-- 
cgit v1.2.3-54-g00ecf