svn commit: r246761 - projects/portbuild/admin/tools

[Mark Linimon]

Author: linimon (doc,ports committer)
Date: Wed Feb 13 14:53:55 2013
New Revision: 246761
URL: http://svnweb.freebsd.org/changeset/base/246761

Log:
  Fix the location for SRCBUILD_OWNED_CONVENIENCE_SUBDIRS.  While here,
  clean up and consolidate.

Modified:
  projects/portbuild/admin/tools/mkportbuild

Modified: projects/portbuild/admin/tools/mkportbuild
==============================================================================
--- projects/portbuild/admin/tools/mkportbuild	Wed Feb 13 13:55:54 2013	(r246760)
+++ projects/portbuild/admin/tools/mkportbuild	Wed Feb 13 14:53:55 2013	(r246761)
@@ -22,7 +22,7 @@ PORTBUILD_OWNED_SUBDIRS="portbuild"
 # define ownership of subdirectories of DEFAULT_ZFS_VOLUME/portbuild/
 SRCBUILD_OWNED_VCS_SUBDIRS="admin docs"
 PORTBUILD_OWNED_VCS_SUBDIRS="conf errorlogs qmanager scripts sources tools"
-SRCBUILD_OWNED_CONVENIENCE_SUBDIRS="lockfiles"
+SRCBUILD_OWNED_CONVENIENCE_SUBDIRS="lockfiles log"
 PORTBUILD_OWNED_CONVENIENCE_SUBDIRS="lockfiles log"
 
 if [ `id -u` != 0 ]; then
@@ -178,9 +178,6 @@ zfs allow ${ZFS_VOLUME}
 chown ${SRCBUILD_USER}:${PORTBUILD_USER} ${ZFS_MOUNTPOINT}/portbuild
 chmod 775 ${ZFS_MOUNTPOINT}/portbuild
 
-PORTBUILD_OWNED_VCS_SUBDIRS="conf errorlogs qmanager scripts sources tools"
-SRCBUILD_OWNED_VCS_SUBDIRS="admin docs"
-
 for subdir in ${PORTBUILD_OWNED_VCS_SUBDIRS}; do
   echo "checking out the ${subdir} repository as user ${PORTBUILD_USER} ..."
   if [ ! -d ${ZFS_MOUNTPOINT}/portbuild/${subdir} ]; then
@@ -209,7 +206,6 @@ echo "$0: in ${ZFS_MOUNTPOINT}/portbuild
 
 # create convenience directories for PORTBUILD_USER.  failure is annoying
 # but non-fatal.
-PORTBUILD_OWNED_CONVENIENCE_SUBDIRS="lockfiles log"
 for extra_dir in ${PORTBUILD_OWNED_CONVENIENCE_SUBDIRS}; do
   if [ ! -d ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} ]; then
     su -m ${PORTBUILD_USER} -c "mkdir ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} 2> /dev/null" || exit 1
@@ -218,10 +214,9 @@ for extra_dir in ${PORTBUILD_OWNED_CONVE
 done
 
 # create convenience directories for SRCBUILD_USER.
-SRCBUILD_OWNED_CONVENIENCE_SUBDIRS="lockfiles log"
 for extra_dir in ${SRCBUILD_OWNED_CONVENIENCE_SUBDIRS}; do
-  if [ ! -d ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} ]; then
-    su -m ${SRCBUILD_USER} -c "mkdir ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} 2> /dev/null" || exit 1
+  if [ ! -d ${ZFS_MOUNTPOINT}/portbuild/admin/${extra_dir} ]; then
+    su -m ${SRCBUILD_USER} -c "mkdir ${ZFS_MOUNTPOINT}/portbuild/admin/${extra_dir} 2> /dev/null" || exit 1
   fi
   chgrp ${SRCBUILD_USER} ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} 2> /dev/null
 done