diff options
| author | linimon <linimon@FreeBSD.org> | 2010-07-30 11:18:21 +0800 |
|---|---|---|
| committer | linimon <linimon@FreeBSD.org> | 2010-07-30 11:18:21 +0800 |
| commit | 88277e55b1c4dd1088e767dec76b407174473552 (patch) | |
| tree | 9e61f4db66c87f7c1b2b7679228afc0708e24f1d /Tools | |
| parent | 1fc5fde4024626a5e16e3e4cf253503a5167b409 (diff) | |
| download | freebsd-ports-gnome-88277e55b1c4dd1088e767dec76b407174473552.tar.gz freebsd-ports-gnome-88277e55b1c4dd1088e767dec76b407174473552.tar.zst freebsd-ports-gnome-88277e55b1c4dd1088e767dec76b407174473552.zip | |
Fix mishandling of root/all case.
Diffstat (limited to 'Tools')
| -rwxr-xr-x | Tools/portbuild/scripts/allgohans | 11 | ||||
| -rwxr-xr-x | Tools/portbuild/scripts/allgohans.safe | 11 |
2 files changed, 10 insertions, 12 deletions
diff --git a/Tools/portbuild/scripts/allgohans b/Tools/portbuild/scripts/allgohans index 21cc660cbc6f..7c3baa5d3398 100755 --- a/Tools/portbuild/scripts/allgohans +++ b/Tools/portbuild/scripts/allgohans @@ -12,7 +12,7 @@ doarch() { fi machines=$(awk '{print $1}' ${pb}/${arch}/mlist) - + for i in ${machines}; do . ${pb}/${arch}/portbuild.conf if [ -f "${pb}/${arch}/portbuild.${i}" ]; then @@ -25,11 +25,10 @@ doarch() { done } -parm=$1 -shift id=$(whoami) if [ "${id}" = "root" ]; then - arch=${parm} + arch=$1 + shift root=1 else arch=$(echo $id | sed s,ports-,,) @@ -44,9 +43,9 @@ else fi pb=/var/portbuild -. ${pb}/conf/server.conf +. ${pb}/scripts/server.conf -if [ "${parm}" = "all" ]; then +if [ "${arch}" = "all" ]; then arches=$(find ${pb}/*/portbuild.conf) for i in ${arches}; do arch=$(basename $(dirname $i)) diff --git a/Tools/portbuild/scripts/allgohans.safe b/Tools/portbuild/scripts/allgohans.safe index ce79fc1f9c71..290755c73584 100755 --- a/Tools/portbuild/scripts/allgohans.safe +++ b/Tools/portbuild/scripts/allgohans.safe @@ -12,7 +12,7 @@ doarch() { fi machines=$(awk '{print $1}' ${pb}/${arch}/mlist) - + for i in ${machines}; do . ${pb}/${arch}/portbuild.conf if [ -f "${pb}/${arch}/portbuild.${i}" ]; then @@ -29,11 +29,10 @@ doarch() { done } -parm=$1 -shift id=$(whoami) if [ "${id}" = "root" ]; then - arch=${parm} + arch=$1 + shift root=1 else arch=$(echo $id | sed s,ports-,,) @@ -48,9 +47,9 @@ else fi pb=/var/portbuild -. ${pb}/conf/server.conf +. ${pb}/scripts/server.conf -if [ "${parm}" = "all" ]; then +if [ "${arch}" = "all" ]; then arches=$(find ${pb}/*/portbuild.conf) for i in ${arches}; do arch=$(basename $(dirname $i)) |