projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18870: Commits stuff
[arvados.git]
/
tools
/
salt-install
/
installer.sh
diff --git
a/tools/salt-install/installer.sh
b/tools/salt-install/installer.sh
index 63db3378e962ca14d92cdf4bbc6066f8096eeab6..a943fff6a7bcc60b2bb114c4ebac304d23688a0c 100755
(executable)
--- a/
tools/salt-install/installer.sh
+++ b/
tools/salt-install/installer.sh
@@
-64,8
+64,12
@@
case "$subcmd" in
source ${CONFIG_FILE}
source ${CONFIG_FILE}
+ set -x
+
git add -A
git add -A
- git commit -m"prepare for deploy"
+ if ! git diff --exit-code ; then
+ git commit -m"prepare for deploy"
+ fi
for NODE in "${!NODES[@]}"
do
if test $NODE = localhost ; then
for NODE in "${!NODES[@]}"
do
if test $NODE = localhost ; then
@@
-73,7
+77,7
@@
case "$subcmd" in
else
if ! ssh $NODE test -d arvados-setup.git ; then
ssh $NODE git init --bare arvados-setup.git
else
if ! ssh $NODE test -d arvados-setup.git ; then
ssh $NODE git init --bare arvados-setup.git
- git
add remote
$NODE $DEPLOY_USER@$NODE:arvados-setup.git
+ git
remote add
$NODE $DEPLOY_USER@$NODE:arvados-setup.git
git push $NODE
ssh $NODE git clone arvados-setup.git arvados-setup
fi
git push $NODE
ssh $NODE git clone arvados-setup.git arvados-setup
fi