aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Linimon <linimon@FreeBSD.org>2010-07-30 03:18:21 +0000
committerMark Linimon <linimon@FreeBSD.org>2010-07-30 03:18:21 +0000
commit2e418d35484f3dda5d613c05610e5270517996c1 (patch)
tree10c00ca82ad0c3154568854baeb141bb0315de83
parent1190ccce37c77ce27f64d6f21d244499437b7c2e (diff)
downloadports-2e418d35484f3dda5d613c05610e5270517996c1.tar.gz
ports-2e418d35484f3dda5d613c05610e5270517996c1.zip
Notes
-rwxr-xr-xTools/portbuild/scripts/allgohans11
-rwxr-xr-xTools/portbuild/scripts/allgohans.safe11
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))