Changeset 2635
- Timestamp:
- 11/18/07 00:52:59 (1 year ago)
- Files:
-
- trunk/scripts/vdispatch-conf (modified) (2 diffs)
- trunk/scripts/vemerge (modified) (2 diffs)
- trunk/scripts/vesync (modified) (2 diffs)
- trunk/scripts/vupdateworld (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/scripts/vdispatch-conf
r2486 r2635 59 59 (--quiet|-q) send_through=( "${send_through[@]}" "$1" );; 60 60 (--all) vsomething_opts=( "${vsomething_opts[@]}" "$1" );; 61 (--) shift; break;;61 (--) test ${#vsomething_opts[@]} -eq 0 && shift; break;; 62 62 (*) echo $"vdispatch-conf: internal error; arg=='$1'" >&2; exit 1;; 63 63 esac … … 65 65 done 66 66 67 VSOMETHING_TITLE=vemerge 67 declare -a vserver_names 68 69 while [ $# -gt 0 ]; do 70 case "$1" in 71 (--) shift; break;; 72 (*) vserver_names=( "${vserver_names[@]}" "$1" );; 73 esac 74 shift 75 done 76 77 VSOMETHING_TITLE=vdispatch-conf 68 78 VSOMETHING_PKGMGMT=1 69 79 70 80 export VSOMETHING_TITLE VSOMETHING_PKGMGMT 71 72 exec $_VSOMETHING "${send_through[@]}" dispatch-conf "${vsomething_opts[@]}" "$@" 81 exec $_VSOMETHING "${send_through[@]}" dispatch-conf "${vsomething_opts[@]}" "${vserver_names[@]}" -- "$@" trunk/scripts/vemerge
r2363 r2635 59 59 (--quiet|-q) send_through=( "${send_through[@]}" "$1" );; 60 60 (--all) vsomething_opts=( "${vsomething_opts[@]}" "$1" );; 61 (--) test ${#vsomething_opts[@]} -eq 0 && shift; break;; 62 (*) echo $"vemerge: internal error; arg=='$1'" >&2; exit 1;; 63 esac 64 shift 65 done 66 67 declare -a vserver_names 68 69 while [ $# -gt 0 ]; do 70 case "$1" in 61 71 (--) shift; break;; 62 (*) echo $"vemerge: internal error; arg=='$1'" >&2; exit 1;;72 (*) vserver_names=( "${vserver_names[@]}" "$1" );; 63 73 esac 64 74 shift … … 69 79 70 80 export VSOMETHING_TITLE VSOMETHING_PKGMGMT 71 72 test ${#vsomething_opts[@]} -eq 0 || vsomething_opts=( "${vsomething_opts[@]}" -- ) 73 exec $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" "$@" 81 exec $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" "${vserver_names[@]}" -- "$@" trunk/scripts/vesync
r2486 r2635 65 65 (--overlay-host) overlay_host="${2%/}";; 66 66 (--overlay-only) overlay_only=1;; 67 (--) shift; break;;67 (--) test ${#vsomething_opts[@]} -eq 0 && shift; break;; 68 68 (*) echo $"vesync: internal error; arg=='$1'" >&2; exit 1;; 69 esac 70 shift 71 done 72 73 declare -a vserver_names 74 75 while [ $# -gt 0 ]; do 76 case "$1" in 77 (--) shift; break;; 78 (*) vserver_names=( "${vserver_names[@]}" "$1" );; 69 79 esac 70 80 shift … … 79 89 80 90 test $overlay_only -eq 0 && \ 81 $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" "$ @" -- --metadata91 $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" "${vserver_names[@]}" -- --metadata 82 92 83 93 ret=$? 84 94 85 95 test -n "$overlay" -a -n "$overlay_host" && \ 86 $_VSOMETHING "${send_through[@]}" rsync "${vsomething_opts[@]}" "$ @" -- \96 $_VSOMETHING "${send_through[@]}" rsync "${vsomething_opts[@]}" "${vserver_names[@]}" -- \ 87 97 -rtW --progress --delete --delete-after "${overlay_host}/" "${overlay}/" 88 98 trunk/scripts/vupdateworld
r2486 r2635 59 59 (--quiet|-q) send_through=( "${send_through[@]}" "$1" );; 60 60 (--all) vsomething_opts=( "${vsomething_opts[@]}" "$1" );; 61 (--) shift; break;;62 (*) echo $"v emerge: internal error; arg=='$1'" >&2; exit 1;;61 (--) test ${#vsomething_opts[@]} -eq 0 && shift; break;; 62 (*) echo $"vupdateworld: internal error; arg=='$1'" >&2; exit 1;; 63 63 esac 64 64 shift … … 75 75 done 76 76 77 VSOMETHING_TITLE=v emerge77 VSOMETHING_TITLE=vupdateworld 78 78 VSOMETHING_PKGMGMT=1 79 79 80 80 export VSOMETHING_TITLE VSOMETHING_PKGMGMT 81 82 test ${#vsomething_opts[@]} -eq 0 || vsomething_opts=( "${vsomething_opts[@]}" -- )83 81 exec $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" "${vserver_names[@]}" -- world --update --deep --newuse "$@"
