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

svn at pcbsd.org svn at pcbsd.org
Wed Oct 27 16:27:13 PDT 2010


Author: kris
Date: 2010-10-27 16:27:13 -0700 (Wed, 27 Oct 2010)
New Revision: 7928

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

Dont make sym link loops by mistake when running .pbi-install.sh manually



Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2010-10-27 23:15:28 UTC (rev 7927)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2010-10-27 23:27:13 UTC (rev 7928)
@@ -2286,9 +2286,11 @@
 	# Xorg Font setup
 	if [ "${PBI_USESYSFONTS}" != "NO" ] ; then
 		echo 'if [ -d "${PBI_PROGDIRPATH}/etc" ] ; then' >> "$insc"
+		echo '	rm "${PBI_PROGDIRPATH}/etc/fonts" >/dev/null 2>/dev/null' >> "$insc"
 		echo '	ln -fs "${SYS_LOCALBASE}/etc/fonts" "${PBI_PROGDIRPATH}/etc/fonts"' >> "$insc"
 		echo 'fi' >> "$insc"
 		echo 'if [ -d "${PBI_PROGDIRPATH}/lib/X11" ] ; then' >> "$insc"
+		echo '	rm "${PBI_PROGDIRPATH}/lib/X11/fonts" >/dev/null 2>/dev/null' >> "$insc"
 		echo '	ln -fs "${SYS_LOCALBASE}/lib/X11/fonts" "${PBI_PROGDIRPATH}/lib/X11/fonts"' >> "$insc"
 		echo 'fi' >> "$insc"
 	fi



More information about the Commits mailing list