From 382336d39d2b48a7b4e4e7c419d9624f1e951149 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Sat, 16 Nov 2019 09:30:06 -0600
Subject: [PATCH] ci: add batch mode to docker-versions-create.sh

---
 docker-versions-create.sh | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/docker-versions-create.sh b/docker-versions-create.sh
index 7f154947..231e429a 100755
--- a/docker-versions-create.sh
+++ b/docker-versions-create.sh
@@ -8,6 +8,23 @@ function TrapExit {
   git checkout master
 }
 
+batchMode=false
+
+while getopts "b" arg
+do
+  case $arg in
+    b)
+      batchMode=true
+      ;;
+    *)
+      echo "Unsupported arg $arg"
+      exit 2
+      ;;
+  esac
+done
+
+${batchMode} && echo "Using batch mode"
+
 trap TrapExit EXIT SIGTERM
 
 test -d ./.git || { echo ".git folder was not found. Please start this script from root directory of the project!";
@@ -37,6 +54,11 @@ for branch in "${branches_list[@]}"; do
         git commit -m "Auto merge branch with master" -a
         # push may fail if remote doesn't have this branch yet. In this case - sending branch
         git push || git push -u origin "$branch" || { echo "Can't push changes to the origin."; exit 1; }
+      elif ${batchMode}; then
+        status=$?
+        echo "Git merge failed in batch mode"
+        exit ${status}
+        # and trap exit gets us back to master
       else
         cat<<EOL
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%