From 0a78bb92ad2b7c6f708a02a0dae5a0668d44a817 Mon Sep 17 00:00:00 2001 From: vgoah Date: Mon, 12 Mar 2012 15:53:11 +0000 Subject: [PATCH] merge from mac branch svn merge -r 470:478 https://subversion.assembla.com/svn/vgoah/homebase/branches/macos/other-sh/rsync-all.sh --- other-sh/rsync-all.sh | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/other-sh/rsync-all.sh b/other-sh/rsync-all.sh index 4967073..bb81e4e 100644 --- a/other-sh/rsync-all.sh +++ b/other-sh/rsync-all.sh @@ -14,7 +14,7 @@ error() usage() { - echo "Usage: $PROGRAM [--all] [--list] [--athome|-m] [--mode|-o ] [--dry|-n] <--tohost|-t> [--help] [--version] [the component...]" + echo "Usage: $PROGRAM [--all] [--list] [--athome|-m] [--mode|-o ] [--dry|-n] <--tohost|-t> [--localroot|-r][--help] [--version] [the component...]" echo "rsync to ip98:" echo -e "\trsync-all.sh -a -t ip98:" echo -e "\trsync-all.sh -t ip98: update" @@ -30,6 +30,8 @@ usage() echo -e "\trsync-all.sh -t /cygdrive/h update" echo "rsync to tu58 for get update and just test" echo -e "\trsync-all.sh -o get -n -t tu58: update" + echo "rsync to 192.168.67.242 for get update and just test on mac" + echo -e "\trsync-all.sh -o get -n -t 192.168.67.242: -r /Volumes/hard update" } usage_and_exit() @@ -61,6 +63,7 @@ user=lifan port=22 #components= hosts= +localroot=/ hostname=`hostname` if [ $hostname = "football12" ] @@ -101,7 +104,11 @@ do shift hosts="$hosts $1" ;; - -*) + --localroot| -r) + shift + localroot="$1" + ;; + -*) error "Unrecognized option: $1" ;; *) @@ -208,8 +215,8 @@ do for j in $hosts do echo rsync to $j... - $rsync_func /e/ori/ $j/e/ori/ $ARGU - $rsync_func /e/update/ $j/e/update/ $ARGU + $rsync_func $localroot/e/ori/ $j/e/ori/ $ARGU + $rsync_func $localroot/e/update/ $j/e/update/ $ARGU done ;; fox) @@ -217,10 +224,10 @@ do for j in $hosts do echo rsync to $j... - $rsync_func /l/scrapbook/ $j/l_disk/scrapbook/ $ARGU + $rsync_func $localroot/l/scrapbook/ $j/l_disk/scrapbook/ $ARGU $rsync_func $HOME/syncplaces.json $j/e/home/$user/syncplaces.json $ARGU $rsync_func $HOME/syncplaces.json.sha1 $j/e/home/$user/syncplaces.json.sha1 $ARGU - $rsync_func /d/temp.txt $j/d/temp.txt $ARGU + $rsync_func $localroot/d/temp.txt $j/d/temp.txt $ARGU done ;; miranda) @@ -228,7 +235,7 @@ do for j in $hosts do echo rsync to $j... - $rsync_func /d/prog/miranda-ing/ $j/d/prog/miranda-ing/ $ARGU + $rsync_func $localroot/d/prog/miranda-ing/ $j/d/prog/miranda-ing/ $ARGU done ;; lb) @@ -236,7 +243,7 @@ do for j in $hosts do echo rsync to $j... - $rsync_func /l/local-backup/ $j/e/l_disk/local-backup/ $ARGU + $rsync_func $localroot/l/local-backup/ $j/e/l_disk/local-backup/ $ARGU done ;; *) @@ -244,7 +251,7 @@ do for j in $hosts do echo rsync to $j... - $rsync_func $i/ $j$i/ $ARGU + $rsync_func $localroot/$i/ $j$i/ $ARGU done ;; esac -- 2.11.4.GIT