Changeset 1172

Timestamp:

Jun 2, 2014, 3:44:03 PM (10 years ago)

Author:

joergs

Message:

improved argument handling

File:

• dasscm/trunk/usr/bin/dasscm_remote_update.sh (modified) (2 diffs)

dasscm/trunk/usr/bin/dasscm_remote_update.sh

@@ -22 +22 @@
 }
 
-OPTIONS=${DASSCM_RSYNC_OPTIONS:-""}
+OPTIONS="${DASSCM_RSYNC_OPTIONS:-}"
 REMOTE_USER=${DASSCM_REMOTE_USER:-"root"}
 
@@ -44 +44 @@
 svn ls -R > $FILELIST
 SERVER=`basename "$PWD"`
-rsync -av --checksum --existing --files-from $FILELIST $OPTIONS $REMOTE_USER@$SERVER:/. . || (echo "FAILED to transfer dasscm files. Failed to access server $SERVER via ssh/rsync?"; usage)
+RESULT=1
+if [ "$OPTIONS" ]; then
+    rsync -av --checksum --existing --files-from $FILELIST "$OPTIONS" $REMOTE_USER@$SERVER:/. .
+    RESULT=$?
+else
+    rsync -av --checksum --existing --files-from $FILELIST $REMOTE_USER@$SERVER:/. .
+    RESULT=$?
+fi
+if [ "$RESULT" -gt 0 ]; then
+    echo "FAILED to transfer dasscm files. Failed to access server $SERVER via ssh/rsync?"
+    usage
+fi
 rm $FILELIST
 echo "updated file must be commited manually"