[PC-BSD Commits] r15804 - pcbsd/current/src-sh/pc-metapkgmanager

[svn at pcbsd.org]

Author: kris
Date: 2012-03-13 20:51:57 +0000 (Tue, 13 Mar 2012)
New Revision: 15804

Modified:
   pcbsd/current/src-sh/pc-metapkgmanager/pc-metapkgmanager
Log:

Update location of meta-pkg sets again, and make changing it an environment
variable



Modified: pcbsd/current/src-sh/pc-metapkgmanager/pc-metapkgmanager
===================================================================
--- pcbsd/current/src-sh/pc-metapkgmanager/pc-metapkgmanager	2012-03-13 20:39:46 UTC (rev 15803)
+++ pcbsd/current/src-sh/pc-metapkgmanager/pc-metapkgmanager	2012-03-13 20:51:57 UTC (rev 15804)
@@ -25,18 +25,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 # Define some defaults
-DBDIR="/var/db/pc-metapkgmanager"
-if [ -n "$1" ] ; then
-  PKGSET="$1"
-else
-  PKGSET="pcbsd"
-fi
-if [ ! -d "${DBDIR}/$PKGSET" ] ; then
- echo "No such package set $PKGSET"
- exit 1
-fi
-MPDIR="${DBDIR}/${PKGSET}"
-
+DBDIR="/var/db/pc-metapkgmanager/pkgsets"
 LOGFILE="/tmp/.pc-metapkgmanager.log"
 FTP_PASSIVE_MODE="YES" ; export FTP_PASSIVE_MODE
 
@@ -364,7 +353,19 @@
 }
 
 
+# Figure out which meta-pkg set we are working on
+if [ -n "$METAPKGSET" ] ; then
+  PKGSET="$METAPKGSET"
+else
+  PKGSET="pcbsd"
+fi
+if [ ! -d "${DBDIR}/$PKGSET" ] ; then
+ echo "No such package set $PKGSET"
+ exit 1
+fi
+MPDIR="${DBDIR}/${PKGSET}"
 
+
 # Figure out which mode we are running in
 case ${1} in
    list) list_metapkgs ;;