[PC-BSD Commits] r8016 - in pcbsd/current/src-sh/pbi-manager: . rc.d

[svn at pcbsd.org]

Author: kris
Date: 2010-11-10 13:06:22 -0800 (Wed, 10 Nov 2010)
New Revision: 8016

Modified:
   pcbsd/current/src-sh/pbi-manager/install.sh
   pcbsd/current/src-sh/pbi-manager/pbi-manager
   pcbsd/current/src-sh/pbi-manager/rc.d/pbid
Log:

Several bugfixes to pbi-manager, now triggering pbid works properly, and files get merged
and cleaned up properly



Modified: pcbsd/current/src-sh/pbi-manager/install.sh
===================================================================
--- pcbsd/current/src-sh/pbi-manager/install.sh	2010-11-10 19:39:21 UTC (rev 8015)
+++ pcbsd/current/src-sh/pbi-manager/install.sh	2010-11-10 21:06:22 UTC (rev 8016)
@@ -47,8 +47,9 @@
 cp ${DIR}/icons/patch.png ${LB}/share/pbi-manager/icons
 
 mkdir -p /var/db/pbi/keys >/dev/null 2>/dev/null
-chmod 644 /var/db/pbi/keys
+chmod 755 /var/db/pbi/keys
 cp ${DIR}/keys/*.ssl /var/db/pbi/keys/
+chmod 755 /var/db/pbi/keys/*.ssl
 
 # Copy the ldconfig script / pbi.conf
 #mkdir -p ${LB}/etc/rc.d >/dev/null 2>/dev/null

Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2010-11-10 19:39:21 UTC (rev 8015)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2010-11-10 21:06:22 UTC (rev 8016)
@@ -1589,8 +1589,8 @@
 
 add_hashdir_trigger() {
 	get_dbdir
-        _htrig="`echo ${APPDBDIR} | sed 's|${PBI_DBAPPDIR}/||g'`"
-	touch ${PBI_DBHASHQUEUEDIR}/${_htrig}
+        _htrig=`echo ${APPDBDIR} | sed "s|${PBI_DBAPPDIR}|${PBI_DBHASHQUEUEDIR}|g"`
+	touch "${_htrig}"
 }
 
 # Run the install script if exists
@@ -2804,12 +2804,15 @@
 	do
 		# Check if we have a dirty hash-dir to cleanup
 		if [ -e "${PBI_DBDIRTYFILE}" ] ; then
+			init_tmpdir
 			pbi_clean_hashdir ${_redir}
 			rm ${PBI_DBDIRTYFILE} >/dev/null 2>/dev/null
+			rm_tmpdir
 		fi
 
 		# Check if we need to merge files into the hashdir
 		if [ ! -z `ls ${PBI_DBHASHQUEUEDIR}` ] ; then
+			init_tmpdir
 			for _hpbi in `ls ${PBI_DBHASHQUEUEDIR}`
 			do
 				if [ ! -e "${PBI_DBAPPDIR}/${_hpbi}/pbi_installedpath" ] ; then
@@ -2826,8 +2829,12 @@
 
 				# Lets start this hash merge
 				pbi_add_update_hashdir "${_hpbipath}" ${_redir}
+				
+				# Now remove the trigger file
+				rm ${PBI_DBHASHQUEUEDIR}/${_hpbi}
 
 			done
+			rm_tmpdir
 
 		fi
 
@@ -4188,7 +4195,7 @@
 load_pbi_etcconf() {
 	if [ ! -e "${PBI_ETCCONF}" ] ; then return 0 ; fi
 	PBI_UPDATEURL="`cat ${PBI_ETCCONF} | grep 'PBI_UPDATEURL: ' | sed 's|PBI_UPDATEURL: ||g'`"
-	PBI_PUBKEYS="`ls ${PBI_DBAPPDIR}/keys/*.ssl 2>/dev/null`"
+	PBI_PUBKEYS="`ls ${PBI_DBKEYDIR}/*.ssl 2>/dev/null`"
 
         # Set the default remote mirror we are using
 	PBI_MIRROR="`cat ${PBI_ETCCONF} | grep 'PBI_MIRROR: ' | sed 's|PBI_MIRROR: ||g'`"

Modified: pcbsd/current/src-sh/pbi-manager/rc.d/pbid
===================================================================
--- pcbsd/current/src-sh/pbi-manager/rc.d/pbid	2010-11-10 19:39:21 UTC (rev 8015)
+++ pcbsd/current/src-sh/pbi-manager/rc.d/pbid	2010-11-10 21:06:22 UTC (rev 8016)
@@ -28,7 +28,7 @@
 
     	echo "Starting ${name}."
 
-	($command) &
+	(nice $command) &
 	echo "$!" > ${pidfile}
 }