[PC-BSD Commits] r7550 - in pcbsd/current/src-qt4/pbi-manager: . man

[svn at pcbsd.org]

Author: kris
Date: 2010-09-13 15:05:43 -0700 (Mon, 13 Sep 2010)
New Revision: 7550

Modified:
   pcbsd/current/src-qt4/pbi-manager/man/pbi_add.1
   pcbsd/current/src-qt4/pbi-manager/pbi-manager
Log:

Update pbi_add usage, installing to diff prefixes will be problematic, but we can safely extract to anywhere for inspection



Modified: pcbsd/current/src-qt4/pbi-manager/man/pbi_add.1
===================================================================
--- pcbsd/current/src-qt4/pbi-manager/man/pbi_add.1	2010-09-13 21:19:22 UTC (rev 7549)
+++ pcbsd/current/src-qt4/pbi-manager/man/pbi_add.1	2010-09-13 22:05:43 UTC (rev 7550)
@@ -40,7 +40,7 @@
 .Bl -tag -width indent
 .It Fl e
 Extract only, do not install. Will extract the archive to ~/<pbidirname>
-unless the -p prefix option is used. 
+unless the -o option is used. 
 .It Fl f
 Force installation, overwriting an already installed copy of the application
 .It Fl g
@@ -49,9 +49,8 @@
 Display information about this PBI file
 .It Fl l
 Display LICENSE information for this PBI file.
-.It Fl p Ar prefix
-Specify the prefix to install the PBI into, otherwise the default the pbi
-was created with will be used.
+.It Fl o Ar outdir
+Specify the directory to use when only extracting the PBI with -e.
 .It Fl r
 Remote fetch the installation file from the update server. The system architecture
 and version will be automatically determined to fetch the correct file. 

Modified: pcbsd/current/src-qt4/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-qt4/pbi-manager/pbi-manager	2010-09-13 21:19:22 UTC (rev 7549)
+++ pcbsd/current/src-qt4/pbi-manager/pbi-manager	2010-09-13 22:05:43 UTC (rev 7550)
@@ -34,7 +34,7 @@
   -g             -- Get and show path to icon / images for gui installer
   -i             -- Display information about this PBI
   -l             -- Display LICENSE text
-  -p prefix      -- Install to different prefix
+  -o outdir      -- Extract to target directory 
   -r 	         -- Remote fetch installation file from update server
   -v             -- Enable verbose output
   --checkscript  -- Display any custom install / removal scripts
@@ -203,9 +203,9 @@
                         ;;
                 -l)     PBI_ADD_LICDISPLAY="YES" 
                         ;;
-                -p)
+                -o)
                         if [ $# -eq 1 ]; then usage_add_pbi; fi
-                        shift; PBI_ALTPREFIX_DIR="$1"
+                        shift; PBI_ALTEXTRACT_DIR="$1"
                         ;;
                 -r)     PBI_REMOTEFETCH="YES" 
 			;;
@@ -243,17 +243,19 @@
         # Lastly set PBI_PROGDIRNAME
         PBI_PROGDIRNAME="`echo ${PBI_ORIGPROGDIRPATH} | rev | cut -d '/' -f 1 | rev`"
 
-	# If installing to a alt-prefix, set it now
-	if [ ! -z "${PBI_ALTPREFIX_DIR}" ] ; then
-		PBI_PROGDIRPATH="${PBI_ALTPREFIX_DIR}/${PBI_PROGDIRNAME}"
+
+	if [ "${PBI_EXTRACTONLY}" = "YES" ] ; then
+		# If extracting to a alt-outdir, set it now
+		PBI_PROGDIRPATH="`pwd`/${PBI_PROGDIRNAME}"
+
+		if [ ! -z "${PBI_ALTEXTRACT_DIR}" ]; then
+			PBI_PROGDIRPATH="${PBI_ALTEXTRACT_DIR}/${PBI_PROGDIRNAME}"
+		fi
 	else
+		# Set the installation dir
 		PBI_PROGDIRPATH="${PBI_ORIGPROGDIRPATH}"
 	fi
 
-	# If this is an extract only
-	if [ "${PBI_EXTRACTONLY}" = "YES" -a -z "$PBI_ALTPREFIX_DIR" ] ; then
-		PBI_PROGDIRPATH="`pwd`/${PBI_PROGDIRNAME}"
-	fi
 }
 
 # Parse the command line