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

[svn at pcbsd.org]

Author: kris
Date: 2011-09-19 10:39:43 -0700 (Mon, 19 Sep 2011)
New Revision: 12862

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

Fix to pbi-manager which allows us to clobber ~/bin entries properly with entries in external-links



Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2011-09-19 17:34:30 UTC (rev 12861)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2011-09-19 17:39:43 UTC (rev 12862)
@@ -4037,13 +4037,15 @@
 	fi
 
 	# Running as user add to ~/bin
+	init_tmpdir
 	if [ ! -d "${HOME}/bin" ] ; then mkdir -p "${HOME}/bin"; fi
-	for lnk in `ls ${1}/${PBI_FAKEBIN_DIR}`
+	cat ${1}/${PBI_FAKEBIN_DIR}/${PBI_INS_PATHSCRIPT} | grep "${1}/${PBI_FAKEBIN_DIR}" | sed 's|$SYS_LOCALBASE|${HOME}|g' >${PBI_TMPDIR}/.binlnks
+	while read lnk
 	do
-		if [ "$lnk" = "$PBI_INS_PATHSCRIPT" -o "$lnk" = "$PBI_UNINS_PATHSCRIPT" ] ; then continue ; fi
-
-		ln -fs "${1}/${PBI_FAKEBIN_DIR}/$lnk" "${HOME}/bin/$lnk"
-	done
+		/bin/sh -c "${lnk}"
+		
+	done <${PBI_TMPDIR}/.binlnks
+	rm ${PBI_TMPDIR}/.binlnks
 	
 }