18870: tweaking git stuff

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

diff --git a/tools/salt-install/installer.sh b/tools/salt-install/installer.sh
index 4d601d9bf906b16d9a954cd9eccf86f1533c7084..604bd7e325a528bdfb6dab49ca69083411f60644 100755 (executable)
--- a/tools/salt-install/installer.sh
+++ b/tools/salt-install/installer.sh
@@ -64,14 +64,18 @@ case "$subcmd" in
 
        source ${CONFIG_FILE}
 
+       set -x
+
        git add -A
-       git commit -m"prepare for deploy"
+       if ! git diff --cached --exit-code ; then
+           git commit -m"prepare for deploy"
+       fi
        for NODE in "${!NODES[@]}"
        do
            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