From: Enrico Scholz Date: Mon, 20 Oct 2003 18:02:23 +0000 (+0000) Subject: made it more mature by using arrays for the vserver-list X-Git-Tag: VERSION_0_10~1183 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=416c3b76d5d3c68f5a606fe110d157e5d8cf7386;p=util-vserver.git made it more mature by using arrays for the vserver-list git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@230 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/scripts/vapt-get b/util-vserver/scripts/vapt-get index bacfd33..36f8a4a 100755 --- a/util-vserver/scripts/vapt-get +++ b/util-vserver/scripts/vapt-get @@ -48,20 +48,21 @@ EOF exit $1 } -vservers= +declare -a vservers=() while test "$#" -ge 1; do case "$1" in --all) getAllVservers tmp - vservers="$vservers $tmp";; + vservers=( "${vservers[@]}" "${tmp[@]}" ) + ;; --) shift; break;; --help) showHelp 0;; --version) showVersion 0;; - *) vservers="$vservers $1";; + *) vservers=( "${vservers[@]}" "$1" ) esac shift done @@ -70,7 +71,7 @@ test "$#" -ge 1 || showHelp 1 >&2 cnt=0 res=255 -for i in $vservers; do +for i in "${vservers[@]}"; do cnt=$[ cnt + 1 ] _APT_GET=apt-get \ "$_NEW_NAMESPACE" "$_VAPT_GET_WORKER" "$i" "$@" diff --git a/util-vserver/scripts/vrpm b/util-vserver/scripts/vrpm index 35311e0..b5ff107 100755 --- a/util-vserver/scripts/vrpm +++ b/util-vserver/scripts/vrpm @@ -42,13 +42,13 @@ EOF } do_unify= -vservers= +declare -a vservers=() while test "$#" -ge 1; do case "$1" in --all) getAllVservers tmp - vservers="$vservers $tmp" + vservers=( "${vservers[@]}" "${tmp[@]}" ) ;; --unify) do_unify=1 @@ -59,7 +59,7 @@ while test "$#" -ge 1; do showHelp 0;; --version) showVersion 0;; - *) vservers="$vservers $1";; + *) vservers=( "${vservers[@]}" "$1" ) esac shift done @@ -68,7 +68,7 @@ test "$#" -ge 1 || showHelp 1 >&2 cnt=0 res=255 -for i in $vservers; do +for i in "${vservers[@]}"; do cnt=$[ cnt + 1 ] "$_NEW_NAMESPACE" "$_VRPM_WORKER" "$i" "$@" res=$?