From: Carlos Sanchez Gonzalez Date: Thu, 24 Aug 2006 18:34:13 +0000 (+0000) Subject: Fix problem with non ssh rsyncs X-Git-Tag: archiva-0.9-alpha-1~671 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0188a4456c15e50655b17e33474d0d75f911daab;p=archiva.git Fix problem with non ssh rsyncs git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@434461 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/maven-meeper/src/bin/m2-sync/m2-sync.sh b/maven-meeper/src/bin/m2-sync/m2-sync.sh index aab66459c..6f34e76cd 100755 --- a/maven-meeper/src/bin/m2-sync/m2-sync.sh +++ b/maven-meeper/src/bin/m2-sync/m2-sync.sh @@ -28,21 +28,23 @@ for f in `find conf -iname "*.sh"` TO= NO_SSH= SSH_OPTS= - RSYNC_SSH= + RSYNC= source $f if [ -z $NO_SSH ] then - RSYNC_SSH="--rsh=ssh $SSH_OPTS" + RSYNC="rsync --rsh=ssh $SSH_OPTS" + else + RSYNC="rsync" fi echo "Syncing $FROM -> $TO" - rsync --include=*/ --include=**/maven-metadata.xml* --exclude=* --exclude-from=$HOME/components/maven-meeper/src/bin/syncopate/exclusions.txt $RSYNC_OPTS -Lrtivz "$RSYNC_SSH" $FROM $BASEDIR/$TO - rsync --exclude-from=$HOME/components/maven-meeper/src/bin/syncopate/exclusions.txt --ignore-existing $RSYNC_OPTS -Lrtivz "$RSYNC_SSH" $FROM $BASEDIR/$TO + "$RSYNC" --include=*/ --include=**/maven-metadata.xml* --exclude=* --exclude-from=$HOME/components/maven-meeper/src/bin/syncopate/exclusions.txt $RSYNC_OPTS -Lrtivz $FROM $BASEDIR/$TO + "$RSYNC" --exclude-from=$HOME/components/maven-meeper/src/bin/syncopate/exclusions.txt --ignore-existing $RSYNC_OPTS -Lrtivz $FROM $BASEDIR/$TO # check for changed files - rsync -n --exclude=**/maven-metadata.xml* --exclude-from=$HOME/components/maven-meeper/src/bin/syncopate/exclusions.txt --existing $RSYNC_OPTS -Lrtivzc "$RSYNC_SSH" $FROM $BASEDIR/$TO >> $CHANGED_LOG + "$RSYNC" -n --exclude=**/maven-metadata.xml* --exclude-from=$HOME/components/maven-meeper/src/bin/syncopate/exclusions.txt --existing $RSYNC_OPTS -Lrtivzc $FROM $BASEDIR/$TO >> $CHANGED_LOG done