[PC-BSD Commits] r19358 - in pcbsd/current/src-sh/pbi-manager: . port-files

[svn at pcbsd.org]

Author: kris
Date: 2012-09-19 14:27:23 +0000 (Wed, 19 Sep 2012)
New Revision: 19358

Modified:
   pcbsd/current/src-sh/pbi-manager/pbi-manager
   pcbsd/current/src-sh/pbi-manager/port-files/pkg-plist
Log:

Also add desktop-directories to xdg dirs to create



Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2012-09-19 14:23:07 UTC (rev 19357)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2012-09-19 14:27:23 UTC (rev 19358)
@@ -1237,6 +1237,7 @@
 	if [ ! -d "${PBI_APPDIR}" ] ; then mkdir -p ${PBI_APPDIR} >/dev/null 2>/dev/null ; fi
 	if [ ! -d "${PBI_XDGCFGDIR}" ] ; then mkdir -p ${PBI_XDGCFGDIR} >/dev/null 2>/dev/null ; fi
 	if [ ! -d "${PBI_XDGAPPDIR}" ] ; then mkdir -p ${PBI_XDGAPPDIR} >/dev/null 2>/dev/null ; fi
+	if [ ! -d "${PBI_XDGDIRDIR}" ] ; then mkdir -p ${PBI_XDGDIRDIR} >/dev/null 2>/dev/null ; fi
 	if [ ! -d "${PBI_RCDIR}" ] ; then mkdir -p ${PBI_RCDIR} >/dev/null 2>/dev/null ; fi
 	if [ ! -d "${PBI_HASHDIR}" ] ; then mkdir -p ${PBI_HASHDIR} >/dev/null 2>/dev/null ; fi
 	if [ ! -d "${PBI_DBAPPDIR}" ] ; then mkdir -p ${PBI_DBAPPDIR} >/dev/null 2>/dev/null ; fi
@@ -1250,7 +1251,7 @@
 	# Set the permissions for directories if we are running as root
 	if [ `id -u` != "0" ] ; then return ; fi
 
-	for cDir in $PBI_APPDIR $PBI_DBAPPDIR $PBI_DBHASHQUEUEDIR $PBI_XDGCFGDIR $PBI_XDGAPPDIR
+	for cDir in $PBI_APPDIR $PBI_DBAPPDIR $PBI_DBHASHQUEUEDIR $PBI_XDGCFGDIR $PBI_XDGAPPDIR $PBI_XDGDIRDIR
 	do	
 		chown root:${PBI_INSTALLGROUP} ${cDir}
 		chmod 775 ${cDir}
@@ -1293,6 +1294,7 @@
 	fi
 	PBI_XDGCFGDIR="${PBI_APPDIR}/etc/xdg"
 	PBI_XDGAPPDIR="${PBI_APPDIR}/share/applications"
+	PBI_XDGDIRDIR="${PBI_APPDIR}/share/desktop-directories"
 	PBI_RCDIR="${SYS_LOCALBASE}/etc/rc.d"
 	PBI_ETCCONF="${SYS_LOCALBASE}/etc/pbi.conf"
 	PCBSD_ETCCONF="${SYS_LOCALBASE}/etc/pcbsd.conf"

Modified: pcbsd/current/src-sh/pbi-manager/port-files/pkg-plist
===================================================================
--- pcbsd/current/src-sh/pbi-manager/port-files/pkg-plist	2012-09-19 14:23:07 UTC (rev 19357)
+++ pcbsd/current/src-sh/pbi-manager/port-files/pkg-plist	2012-09-19 14:27:23 UTC (rev 19358)
@@ -68,6 +68,7 @@
 @unexec rm /usr/pbi/.pbiwrapper >/dev/null 2>/dev/null
 @unexec rmdir /usr/pbi/.hashdir >/dev/null 2>/dev/null
 @unexec rmdir /usr/pbi/share/applications >/dev/null 2>/dev/null
+ at unexec rmdir /usr/pbi/share/desktop-directories >/dev/null 2>/dev/null
 @unexec rmdir /usr/pbi/share >/dev/null 2>/dev/null
 @unexec rmdir /usr/pbi/etc/xdg >/dev/null 2>/dev/null
 @unexec rmdir /usr/pbi/etc >/dev/null 2>/dev/null