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

[svn at pcbsd.org]

Author: kris
Date: 2011-11-03 10:11:26 -0700 (Thu, 03 Nov 2011)
New Revision: 13697

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

Fix using the default PBI icon




Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2011-11-03 15:04:58 UTC (rev 13696)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2011-11-03 17:11:26 UTC (rev 13697)
@@ -1253,6 +1253,7 @@
 	PBI_ETCCONF="${SYS_LOCALBASE}/etc/pbi.conf"
 	PCBSD_ETCCONF="${SYS_LOCALBASE}/etc/pcbsd.conf"
 	PBI_DEFAULT_ICON="${PROGBASE}/share/pbi-manager/icons/default.png"
+	PBI_DEFAULT_ICON_CHROOT="/default.png"
 	PBI_PATCH_ICON="${PROGBASE}/share/pbi-manager/icons/patch.png"
 	PBI_LDCONFIGFILE="${PROGBASE}/etc/ldpbiconfig"
 	PBI_LDCONFIGRC="${PROGBASE}/etc/rc.d/ldpbiconfig"
@@ -3761,6 +3762,7 @@
 		--exclude make.conf.bak --exclude .keepports \
 		-C "${PBI_PROGDIRPATH}" . 2>/dev/null \
 		| tar xvpf - -C ${PBI_STAGEDIR} 2>/dev/null
+
 }
 
 # Remove the stagedir
@@ -3860,8 +3862,8 @@
 		_iconExt=`echo "$PBI_PROGICON" | awk -F . '{print $NF}'`
 		cp "${PBI_STAGEDIR}/${PBI_PROGICON}" "${PBI_HEADERDIR}/pbi_icon.${_iconExt}"
 	else
-		_iconExt=`echo "$PBI_DEFAULT_ICON" | awk -F . '{print $NF}'`
-		cp "${PBI_DEFAULT_ICON}" "${PBI_HEADERDIR}/pbi_icon.${_iconExt}"
+		_iconExt=`echo "$PBI_DEFAULT_ICON_CHROOT" | awk -F . '{print $NF}'`
+		cp "${PBI_DEFAULT_ICON_CHROOT}" "${PBI_HEADERDIR}/pbi_icon.${_iconExt}"
 	fi
 
 	# Check for any gui images
@@ -3906,7 +3908,7 @@
         if [ ! -z "${PBI_PROGICON}" -a -e "${PBI_STAGEDIR}/${PBI_PROGICON}" ] ; then
                 icon="${PBI_STAGEDIR}/${PBI_PROGICON}"
         else
-                icon="${PBI_DEFAULT_ICON}"
+                icon="${PBI_DEFAULT_ICON_CHROOT}"
         fi
 	_pbilow="`echo ${PBI_PROGNAME} | tr '[:upper:]' '[:lower:]' | sed 's| ||g'`"
 
@@ -6083,6 +6085,9 @@
 	cp ${PBI_CHROOTDIR}/usr/local/sbin/pbi_makeport ${PBI_CHROOTDIR}/usr/local/sbin/pbi_makeport_chroot
 	chmod 755 ${PBI_CHROOTDIR}/usr/local/sbin/pbi_*
 
+	# Copy the default icons
+	cp ${PBI_DEFAULT_ICON} ${PBI_CHROOTDIR}${PBI_DEFAULT_ICON_CHROOT}
+
 	# Make sure the outgoing dir is created
 	mkdir -p ${PBI_CHROOTDIR}/pbiout