aboutsummaryrefslogtreecommitdiff
path: root/Tools
diff options
context:
space:
mode:
authorMark Linimon <linimon@FreeBSD.org>2010-06-25 22:51:05 +0000
committerMark Linimon <linimon@FreeBSD.org>2010-06-25 22:51:05 +0000
commit11ad804e71f4f3d7ff4f716213c7535aa278ba15 (patch)
tree7f3955c4c4b2780ddb38609cfd9458e930cfcb8c /Tools
parentae733423e0dbdeae7883a8d71a860355ba0c6540 (diff)
downloadports-11ad804e71f4f3d7ff4f716213c7535aa278ba15.tar.gz
ports-11ad804e71f4f3d7ff4f716213c7535aa278ba15.zip
Notes
Diffstat (limited to 'Tools')
-rwxr-xr-xTools/portbuild/scripts/allgohans11
-rwxr-xr-xTools/portbuild/scripts/allgohans.safe9
2 files changed, 13 insertions, 7 deletions
diff --git a/Tools/portbuild/scripts/allgohans b/Tools/portbuild/scripts/allgohans
index aa851b729e7c..21cc660cbc6f 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,10 +25,11 @@ doarch() {
done
}
+parm=$1
+shift
id=$(whoami)
if [ "${id}" = "root" ]; then
- arch=$1
- shift
+ arch=${parm}
root=1
else
arch=$(echo $id | sed s,ports-,,)
@@ -43,7 +44,9 @@ else
fi
pb=/var/portbuild
-if [ "${arch}" = "all" ]; then
+. ${pb}/conf/server.conf
+
+if [ "${parm}" = "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 a8dd5fbc110c..ce79fc1f9c71 100755
--- a/Tools/portbuild/scripts/allgohans.safe
+++ b/Tools/portbuild/scripts/allgohans.safe
@@ -29,10 +29,11 @@ doarch() {
done
}
+parm=$1
+shift
id=$(whoami)
if [ "${id}" = "root" ]; then
- arch=$1
- shift
+ arch=${parm}
root=1
else
arch=$(echo $id | sed s,ports-,,)
@@ -47,7 +48,9 @@ else
fi
pb=/var/portbuild
-if [ "${arch}" = "all" ]; then
+. ${pb}/conf/server.conf
+
+if [ "${parm}" = "all" ]; then
arches=$(find ${pb}/*/portbuild.conf)
for i in ${arches}; do
arch=$(basename $(dirname $i))