Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 Dec 2012 00:22:48 +0000 (UTC)
From:      Mark Linimon <linimon@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r244330 - projects/portbuild/scripts
Message-ID:  <201212170022.qBH0Mmtk080986@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: linimon (doc,ports committer)
Date: Mon Dec 17 00:22:48 2012
New Revision: 244330
URL: http://svnweb.freebsd.org/changeset/base/244330

Log:
  Fix default location of various subdirs (clients/ and so forth).  Turn
  off the creation of the .ssh directory; it is in the wrong place.

Modified:
  projects/portbuild/scripts/build

Modified: projects/portbuild/scripts/build
==============================================================================
--- projects/portbuild/scripts/build	Mon Dec 17 00:17:18 2012	(r244329)
+++ projects/portbuild/scripts/build	Mon Dec 17 00:22:48 2012	(r244330)
@@ -70,13 +70,13 @@ do_create() {
       chmod -R g+w ${archdir}
     fi
 
-    # create .ssh/ directory if it does not already exist 
-    sshdir=${pbd}/${arch}/.ssh
-    if [ ! -d ${sshdir} ]; then
-	mkdir -p ${sshdir} || exit 1
-	chown -R ${uid}:${gid} ${sshdir}
-	chmod 700 ${sshdir}
-    fi
+#    # create .ssh/ directory if it does not already exist 
+#    sshdir=${pbd}/${arch}/.ssh
+#    if [ ! -d ${sshdir} ]; then
+#	mkdir -p ${sshdir} || exit 1
+#	chown -R ${uid}:${gid} ${sshdir}
+#	chmod 700 ${sshdir}
+#    fi
 
     # create overall archive directory if it does not already exist 
     archivedir=${pbd}/${arch}/archive
@@ -134,7 +134,7 @@ do_create() {
     ln -sf ${builddir} ${pbab}/builds/latest
 
     # create clients/ directory if it does not already exist 
-    clientsdir=${pbab}/clients
+    clientsdir=${pbd}/${arch}/clients
     if [ ! -d ${clientsdir} ]; then
 	mkdir -p ${clientsdir} || exit 1
 	chown -R ${uid}:${gid} ${clientsdir}
@@ -142,7 +142,7 @@ do_create() {
     fi
 
     # create loads/ directory if it does not already exist 
-    loadsdir=${pbab}/loads
+    loadsdir=${pbd}/${arch}/loads
     if [ ! -d ${loadsdir} ]; then
 	mkdir -p ${loadsdir} || exit 1
 	chown -R ${uid}:${gid} ${loadsdir}
@@ -150,7 +150,7 @@ do_create() {
     fi
 
     # create lockfiles/ directory if it does not already exist 
-    lockfiles=${pbab}/lockfiles
+    lockfiles=${pbd}/${arch}/lockfiles
     if [ ! -d ${lockfiles} ]; then
         mkdir -p ${lockfiles} || exit 1
         chown -R ${uid}:${gid} ${lockfiles}
@@ -158,7 +158,7 @@ do_create() {
     fi
 
     # create empty mlist file if it does not already exist 
-    mlist=${pbab}/mlist
+    mlist=${pbd}/${arch}/mlist
     if [ ! -d ${mlist} ]; then
 	touch ${mlist} || exit 1
 	chown -R ${uid}:${gid} ${mlist}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212170022.qBH0Mmtk080986>