Fix mishandling of root/all case.

1 files changed, 5 insertions, 6 deletions

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))