[PC-BSD Commits] r7846 - pcbsd/current/src-sh/pbi-manager

[svn at pcbsd.org]

Author: kris
Date: 2010-10-17 13:11:12 -0700 (Sun, 17 Oct 2010)
New Revision: 7846

Modified:
   pcbsd/current/src-sh/pbi-manager/pbi-manager
Log:

Update pbi-manager, exit on 0 properly after success, don't need to trap exit
0 status



Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2010-10-16 13:34:33 UTC (rev 7845)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2010-10-17 20:11:12 UTC (rev 7846)
@@ -1014,8 +1014,7 @@
 # Confirm we are running as root
 require_root() {
   if [ `id -u` != "0" ] ; then
-     echo "`basename ${0}`: Must be run as root!"
-     exit_trap
+     exit_err "Must be run as root!"
   fi 
 }
 
@@ -4059,7 +4058,7 @@
 # Cleanup after caught exit
 exit_trap() {
 	rm_tmpdir
-	exit 255
+	exit 0
 }
 
 # Read in the global pbi.conf
@@ -4123,7 +4122,7 @@
 mk_required_dirs
 load_pbi_etcconf
 
-trap exit_trap 0 1 2 3 15
+trap exit_trap 1 2 3 15
 
 # Figure out which mode we are running in
 case `basename ${0}` in