From 871fc5b73f3a6b76afc5e82da3378f47fd356a4f Mon Sep 17 00:00:00 2001
From: Vasily Korytov <vasily@codefresh.io>
Date: Thu, 14 May 2020 15:23:17 +0300
Subject: [PATCH 1/4] correct error exit status

---
 script/updategitsubmodules.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/script/updategitsubmodules.sh b/script/updategitsubmodules.sh
index 36cb1ff..a09751d 100755
--- a/script/updategitsubmodules.sh
+++ b/script/updategitsubmodules.sh
@@ -1,8 +1,9 @@
 #!/bin/sh
+set -e
 
 if [ -z "$GITHUB_TOKEN" ]; then
     echo "ERROR: \$GITHUB_TOKEN var is not set or empty"
-    exit
+    exit 1
 fi
 
 mkdir ~/.ssh
@@ -27,4 +28,4 @@ fi
 echo "Updating git submodules"
 echo "git submodule update --init $SUBMODULE_UPDATE_RECURSIVE_FLAG"
 git submodule update --init $SUBMODULE_UPDATE_RECURSIVE_FLAG
-echo "Git submodules were updated"
\ No newline at end of file
+echo "Git submodules were updated"

From 95e55b46c6d45d4b03f7a703a4c397a224d7be82 Mon Sep 17 00:00:00 2001
From: Vasily Korytov <vasily@codefresh.io>
Date: Thu, 14 May 2020 15:24:50 +0300
Subject: [PATCH 2/4] fix recursive submodules

currently we depend on a hack that uses sed to enforce https, not git for github.
this doesn't work for submodules.

re-doing this hack with a `git config` instead
---
 script/updategitsubmodules.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/script/updategitsubmodules.sh b/script/updategitsubmodules.sh
index a09751d..5a5ad92 100755
--- a/script/updategitsubmodules.sh
+++ b/script/updategitsubmodules.sh
@@ -8,10 +8,7 @@ fi
 
 mkdir ~/.ssh
 ssh-keyscan github.com > ~/.ssh/known_hosts
-sed -i 's/git@/https:\/\//' .gitmodules || exit
-sed -i 's/ssh:\/\///' .gitmodules
-sed -i 's/github.com:/github.com\//' .gitmodules
-sed -i "s/https:\/\/github.com/https:\/\/$GITHUB_TOKEN@github.com/" .gitmodules
+git config --global url.https://$GITHUB_TOKEN@github.com/.insteadOf git@github.com:
 
 if [ "$CF_SUBMODULE_SYNC" = "true" ]; then
   echo "\$CF_SUBMODULE_SYNC var is set to 'true'. Syncing submodules"

From 9c21e18504c532b485ee79e9e1c9e5a8644819ea Mon Sep 17 00:00:00 2001
From: Vasily Korytov <vasily@codefresh.io>
Date: Thu, 14 May 2020 15:36:48 +0300
Subject: [PATCH 3/4] it looks like we don't need ssh hack, as we don't use ssh

---
 script/updategitsubmodules.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/script/updategitsubmodules.sh b/script/updategitsubmodules.sh
index 5a5ad92..dec77e9 100755
--- a/script/updategitsubmodules.sh
+++ b/script/updategitsubmodules.sh
@@ -6,8 +6,6 @@ if [ -z "$GITHUB_TOKEN" ]; then
     exit 1
 fi
 
-mkdir ~/.ssh
-ssh-keyscan github.com > ~/.ssh/known_hosts
 git config --global url.https://$GITHUB_TOKEN@github.com/.insteadOf git@github.com:
 
 if [ "$CF_SUBMODULE_SYNC" = "true" ]; then

From 0f30df7339366d11ea406974a421704a0091c25e Mon Sep 17 00:00:00 2001
From: Vasily Korytov <vasily@codefresh.io>
Date: Thu, 14 May 2020 15:40:38 +0300
Subject: [PATCH 4/4] codestyle (4 spaces for indent, not a mix of 4 and 2)

---
 script/updategitsubmodules.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/script/updategitsubmodules.sh b/script/updategitsubmodules.sh
index dec77e9..0bd6231 100755
--- a/script/updategitsubmodules.sh
+++ b/script/updategitsubmodules.sh
@@ -9,15 +9,15 @@ fi
 git config --global url.https://$GITHUB_TOKEN@github.com/.insteadOf git@github.com:
 
 if [ "$CF_SUBMODULE_SYNC" = "true" ]; then
-  echo "\$CF_SUBMODULE_SYNC var is set to 'true'. Syncing submodules"
-  echo "git submodule sync"
-  git submodule sync
+    echo "\$CF_SUBMODULE_SYNC var is set to 'true'. Syncing submodules"
+    echo "git submodule sync"
+    git submodule sync
 fi
 
 SUBMODULE_UPDATE_RECURSIVE_FLAG=""
 if [ "$CF_SUBMODULE_UPDATE_RECURSIVE" = "true" ]; then
-  echo "\$CF_SUBMODULE_UPDATE_RECURSIVE var is set to 'true'. Submodules will be recursively updated"
-  SUBMODULE_UPDATE_RECURSIVE_FLAG=--recursive
+    echo "\$CF_SUBMODULE_UPDATE_RECURSIVE var is set to 'true'. Submodules will be recursively updated"
+    SUBMODULE_UPDATE_RECURSIVE_FLAG=--recursive
 fi
 
 echo "Updating git submodules"