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

[svn at pcbsd.org]

Author: kris
Date: 2012-09-19 14:21:03 +0000 (Wed, 19 Sep 2012)
New Revision: 19356

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

Add some extra xdg data dirs to PBI



Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2012-09-19 14:17:47 UTC (rev 19355)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2012-09-19 14:21:03 UTC (rev 19356)
@@ -1235,7 +1235,8 @@
 # Make some of our required PBI dirs
 mk_required_dirs() {
 	if [ ! -d "${PBI_APPDIR}" ] ; then mkdir -p ${PBI_APPDIR} >/dev/null 2>/dev/null ; fi
-	if [ ! -d "${PBI_XDGDIR}" ] ; then mkdir -p ${PBI_XDGDIR} >/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_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
@@ -1249,7 +1250,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_XDGDIR
+	for cDir in $PBI_APPDIR $PBI_DBAPPDIR $PBI_DBHASHQUEUEDIR $PBI_XDGCFGDIR $PBI_XDGAPPDIR
 	do	
 		chown root:${PBI_INSTALLGROUP} ${cDir}
 		chmod 775 ${cDir}
@@ -1290,7 +1291,8 @@
 	else
 		PBI_HASHDIR="${PBI_APPDIR}/.hashdir-`whoami`"
 	fi
-	PBI_XDGDIR="${PBI_APPDIR}/share"
+	PBI_XDGCFGDIR="${PBI_APPDIR}/etc/xdg"
+	PBI_XDGAPPDIR="${PBI_APPDIR}/share/applications"
 	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:17:47 UTC (rev 19355)
+++ pcbsd/current/src-sh/pbi-manager/port-files/pkg-plist	2012-09-19 14:21:03 UTC (rev 19356)
@@ -67,4 +67,8 @@
 @dirrm %%DATADIR%%
 @unexec rm /usr/pbi/.pbiwrapper >/dev/null 2>/dev/null
 @unexec rmdir /usr/pbi/.hashdir >/dev/null 2>/dev/null
+ at unexec rmdir /usr/pbi/share/applications >/dev/null 2>/dev/null
+ at unexec rmdir /usr/pbi/share >/dev/null 2>/dev/null
+ at unexec rmdir /usr/pbi/etc/xdg >/dev/null 2>/dev/null
+ at unexec rmdir /usr/pbi/etc >/dev/null 2>/dev/null
 @unexec rmdir /usr/pbi >/dev/null 2>/dev/null