You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ca...@apache.org on 2006/08/24 20:34:15 UTC

svn commit: r434461 - /maven/archiva/trunk/maven-meeper/src/bin/m2-sync/m2-sync.sh

Author: carlos
Date: Thu Aug 24 11:34:13 2006
New Revision: 434461

URL: http://svn.apache.org/viewvc?rev=434461&view=rev
Log:
Fix problem with non ssh rsyncs

Modified:
    maven/archiva/trunk/maven-meeper/src/bin/m2-sync/m2-sync.sh

Modified: maven/archiva/trunk/maven-meeper/src/bin/m2-sync/m2-sync.sh
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/maven-meeper/src/bin/m2-sync/m2-sync.sh?rev=434461&r1=434460&r2=434461&view=diff
==============================================================================
--- maven/archiva/trunk/maven-meeper/src/bin/m2-sync/m2-sync.sh (original)
+++ maven/archiva/trunk/maven-meeper/src/bin/m2-sync/m2-sync.sh Thu Aug 24 11:34:13 2006
@@ -28,21 +28,23 @@
   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