svn commit: r246695 - projects/portbuild/admin/scripts

[Mark Linimon]

Author: linimon (doc,ports committer)
Date: Mon Feb 11 23:04:12 2013
New Revision: 246695
URL: http://svnweb.freebsd.org/changeset/base/246695

Log:
  Make these more comfortable in the new world.

Modified:
  projects/portbuild/admin/scripts/makeworld
  projects/portbuild/admin/scripts/mkbindist
  projects/portbuild/admin/scripts/updatesnap
  projects/portbuild/admin/scripts/updatesnap.ports

Modified: projects/portbuild/admin/scripts/makeworld
==============================================================================
--- projects/portbuild/admin/scripts/makeworld	Mon Feb 11 22:59:10 2013	(r246694)
+++ projects/portbuild/admin/scripts/makeworld	Mon Feb 11 23:04:12 2013	(r246695)
@@ -27,8 +27,8 @@ if [ $# -gt 0 ]; then
   esac
 fi
 
-pbc=${PORTBUILD_CHECKOUT:-/var/portbuild}
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbc=${PORTBUILD_CHECKOUT:-/a/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
 
 builddir=${pbd}/${arch}/${branch}/builds/${buildid}
 if [ ! -d ${builddir} ]; then
@@ -36,6 +36,7 @@ if [ ! -d ${builddir} ]; then
     exit 1
 fi
 
+. ${pbc}/admin/conf/admin.conf
 . ${pbc}/conf/server.conf
 . ${pbc}/conf/common.conf
 . ${pbd}/${arch}/portbuild.conf

Modified: projects/portbuild/admin/scripts/mkbindist
==============================================================================
--- projects/portbuild/admin/scripts/mkbindist	Mon Feb 11 22:59:10 2013	(r246694)
+++ projects/portbuild/admin/scripts/mkbindist	Mon Feb 11 23:04:12 2013	(r246695)
@@ -30,8 +30,8 @@ if [ $# -gt 0 ]; then
     shift
 fi
 
-pbc=${PORTBUILD_CHECKOUT:-/var/portbuild}
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbc=${PORTBUILD_CHECKOUT:-/a/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
 
 builddir=${pbd}/${arch}/${branch}/builds/${buildid}
 if [ ! -d ${builddir} ]; then
@@ -39,6 +39,7 @@ if [ ! -d ${builddir} ]; then
     exit 1
 fi
  
+. ${pbc}/admin/conf/admin.conf
 . ${pbc}/conf/server.conf
 . ${pbd}/${arch}/portbuild.conf
 if [ -f ${builddir}/portbuild.conf ]; then

Modified: projects/portbuild/admin/scripts/updatesnap
==============================================================================
--- projects/portbuild/admin/scripts/updatesnap	Mon Feb 11 22:59:10 2013	(r246694)
+++ projects/portbuild/admin/scripts/updatesnap	Mon Feb 11 23:04:12 2013	(r246695)
@@ -5,6 +5,7 @@
 
 pbc=${PORTBUILD_CHECKOUT:-/a/portbuild}
 
+. ${pbc}/admin/conf/admin.conf
 . ${pbc}/conf/server.conf
 
 base=${ZFS_MOUNTPOINT}/${SNAP_DIRECTORY}

Modified: projects/portbuild/admin/scripts/updatesnap.ports
==============================================================================
--- projects/portbuild/admin/scripts/updatesnap.ports	Mon Feb 11 22:59:10 2013	(r246694)
+++ projects/portbuild/admin/scripts/updatesnap.ports	Mon Feb 11 23:04:12 2013	(r246695)
@@ -5,6 +5,7 @@
 
 pbc=${PORTBUILD_CHECKOUT:-/a/portbuild}
 
+. ${pbc}/admin/conf/admin.conf
 . ${pbc}/conf/server.conf
 
 base=${ZFS_MOUNTPOINT}/${SNAP_DIRECTORY}