18870: git stuff

[arvados.git] / tools / salt-install / installer.sh

diff --git a/tools/salt-install/installer.sh b/tools/salt-install/installer.sh
index a943fff6a7bcc60b2bb114c4ebac304d23688a0c..37f1baf20ea5e48e1a21125848bd55620c77abd0 100755 (executable)
--- a/tools/salt-install/installer.sh
+++ b/tools/salt-install/installer.sh
@@ -67,7 +67,7 @@ case "$subcmd" in
        set -x
 
        git add -A
-       if ! git diff --exit-code ; then
+       if ! git diff --cached --exit-code ; then
            git commit -m"prepare for deploy"
        fi
        for NODE in "${!NODES[@]}"
@@ -75,10 +75,12 @@ case "$subcmd" in
            if test $NODE = localhost ; then
                sudo ./provision.sh --config local.params --roles ${NODES[$NODE]}
            else
-               if ! ssh $NODE test -d arvados-setup.git ; then
+               if ! ssh $NODE test -d arvados-setup ; then
                    ssh $NODE git init --bare arvados-setup.git
-                   git remote add $NODE $DEPLOY_USER@$NODE:arvados-setup.git
-                   git push $NODE
+                   if ! git remote add $NODE $DEPLOY_USER@$NODE:arvados-setup.git ; then
+                       git remote set-url $NODE $DEPLOY_USER@$NODE:arvados-setup.git
+                   fi
+                   git push $NODE master
                    ssh $NODE git clone arvados-setup.git arvados-setup
                fi