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 aab66459c8a2e67745b72ce73829383a4755c151..6f34e76cd0db027b9ddc32813163db9ee373e4f5 100755 (executable)
--- 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