diff options
| author | Carlos Sanchez Gonzalez <carlos@apache.org> | 2006-08-24 18:34:13 +0000 |
|---|---|---|
| committer | Carlos Sanchez Gonzalez <carlos@apache.org> | 2006-08-24 18:34:13 +0000 |
| commit | 0188a4456c15e50655b17e33474d0d75f911daab (patch) | |
| tree | 89ea4fb27886653329d8a3525136b867e4218539 /maven-meeper/src/bin | |
| parent | c769597ddc1f2cdc4095d417df7436e24ed26e02 (diff) | |
| download | archiva-0188a4456c15e50655b17e33474d0d75f911daab.tar.gz archiva-0188a4456c15e50655b17e33474d0d75f911daab.zip | |
Fix problem with non ssh rsyncs
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@434461 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'maven-meeper/src/bin')
| -rwxr-xr-x | maven-meeper/src/bin/m2-sync/m2-sync.sh | 12 |
1 files changed, 7 insertions, 5 deletions
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 |