Mac installer: make Uninstaller a bit more robust

diff --git a/distrib/MacOS/installer-scripts/Uninstaller b/distrib/MacOS/installer-scripts/Uninstaller
index 0b79258..678fce8 100644 (file)
--- a/distrib/MacOS/installer-scripts/Uninstaller
+++ b/distrib/MacOS/installer-scripts/Uninstaller
@@ -48,19 +48,19 @@ if [ ${NO_VERSIONS} -ne 2 ]; then
 fi
 
 echo "Removing symbolic links into GHC.framework"
-for thisfile in `ls ${INSTALL_BIN}`; do
-  if ls -l ${INSTALL_BIN}/${thisfile} | grep -q GHC.framework/Versions; then
-    rm -f ${INSTALL_BIN}/${thisfile}
+for thisfile in ${INSTALL_BIN}/*; do
+  if ls -l "${thisfile}" | grep -q GHC.framework/Versions; then
+    rm -f "${thisfile}"
   fi
 done
-for thisfile in `ls ${INSTALL_MAN1}`; do
-  if ls -l ${INSTALL_MAN1}/${thisfile} | grep -q GHC.framework/Versions; then
-    rm -f ${INSTALL_MAN1}/${thisfile}
+for thisfile in ${INSTALL_MAN1}/*; do
+  if ls -l "${thisfile}" | grep -q GHC.framework/Versions; then
+    rm -f "${thisfile}"
   fi
 done
-for thisfile in `ls ${INSTALL_HTML}`; do
-  if ls -l ${INSTALL_HTML}/${thisfile} | grep -q GHC.framework/Versions; then
-    rm -f ${INSTALL_HTML}/${thisfile}
+for thisfile in ${INSTALL_HTML}/*; do
+  if ls -l "${thisfile}" | grep -q GHC.framework/Versions; then
+    rm -f "${thisfile}"
   fi
 done
 

diff --git a/distrib/MacOS/installer-scripts/create-links b/distrib/MacOS/installer-scripts/create-links
index 7102f12..4453a9d 100644 (file)
--- a/distrib/MacOS/installer-scripts/create-links
+++ b/distrib/MacOS/installer-scripts/create-links
@@ -14,12 +14,18 @@ fi
 
 INSTALL_BIN=${INSTALL_BASE}/bin
 mkdir -p ${INSTALL_BIN}
-ln -sf ${INSTALL_DEST}/GHC.framework/Versions/Current/usr/bin/* ${INSTALL_BIN}/
+if [ -d ${INSTALL_DEST}/GHC.framework/Versions/Current/usr/bin ]; then
+  ln -sf ${INSTALL_DEST}/GHC.framework/Versions/Current/usr/bin/*\
+        ${INSTALL_BIN}/
+fi
 
 INSTALL_MAN1=${INSTALL_BASE}/share/man/man1
 INSTALL_HTML=${INSTALL_BASE}/share/doc
 mkdir -p ${INSTALL_MAN1}
-ln -sf ${INSTALL_DEST}/GHC.framework/Versions/Current/usr/share/man/man1/*\
-       ${INSTALL_MAN1}/
-ln -sf ${INSTALL_DEST}/GHC.framework/Versions/Current/usr/share/doc/ghc\
-       ${INSTALL_HTML}/
+if [ -d ${INSTALL_DEST}/GHC.framework/Versions/Current/usr/share/man/man1 ]; 
+then
+  ln -sf ${INSTALL_DEST}/GHC.framework/Versions/Current/usr/share/man/man1/*\
+        ${INSTALL_MAN1}/
+  ln -sf ${INSTALL_DEST}/GHC.framework/Versions/Current/usr/share/doc/ghc\
+        ${INSTALL_HTML}/
+fi