[rkward-cvs] SF.net SVN: rkward-code:[4775] trunk/rkward/macports/update_bundle.sh

[m-eik at users.sf.net]

Revision: 4775
          http://sourceforge.net/p/rkward/code/4775
Author:   m-eik
Date:     2014-03-06 12:23:58 +0000 (Thu, 06 Mar 2014)
Log Message:
-----------
MacPorts: added two missing symlinks to bundle build script, and simplifying the routine a bit

Modified Paths:
--------------
    trunk/rkward/macports/update_bundle.sh

Modified: trunk/rkward/macports/update_bundle.sh
===================================================================
--- trunk/rkward/macports/update_bundle.sh	2014-03-05 09:17:20 UTC (rev 4774)
+++ trunk/rkward/macports/update_bundle.sh	2014-03-06 12:23:58 UTC (rev 4775)
@@ -119,26 +119,20 @@
     sudo rm -rf /Applications/MacPorts || exit 1
   fi
   # these leftovers would conflict with port installation
-  if [ -L /Library/LaunchDaemons/org.freedesktop.dbus-system.plist ] ; then
-    echo "removing symbolic link /Library/LaunchDaemons/org.freedesktop.dbus-system.plist..."
-    sudo rm /Library/LaunchDaemons/org.freedesktop.dbus-system.plist
-  fi
-  if [ -L /Library/LaunchAgents/org.freedesktop.dbus-session.plist ] ; then
-    echo "removing symbolic link /Library/LaunchAgents/org.freedesktop.dbus-session.plist..."
-    sudo rm /Library/LaunchAgents/org.freedesktop.dbus-session.plist
-  fi
-  if [ -L /Library/LaunchDaemons/org.freedesktop.avahi-daemon.plist ] ; then
-    echo "removing symbolic link /Library/LaunchDaemons/org.freedesktop.avahi-daemon.plist..."
-    sudo rm /Library/LaunchDaemons/org.freedesktop.avahi-daemon.plist
-  fi
-  if [ -L /Library/LaunchDaemons/org.freedesktop.avahi-dnsconfd.plist ] ; then
-    echo "removing symbolic link /Library/LaunchDaemons/org.freedesktop.avahi-dnsconfd.plist..."
-    sudo rm /Library/LaunchDaemons/org.freedesktop.avahi-dnsconfd.plist
-  fi
-  if [ -L /Library/LaunchAgents/org.macports.kdecache.plist ] ; then
-    echo "removing symbolic link /Library/LaunchAgents/org.macports.kdecache.plist..."
-    sudo rm /Library/LaunchAgents/org.macports.kdecache.plist
-  fi
+  for libsymlink in \
+    /Library/LaunchDaemons/org.freedesktop.dbus-system.plist \
+    /Library/LaunchAgents/org.freedesktop.dbus-session.plist \
+    /Library/LaunchDaemons/org.freedesktop.avahi-daemon.plist \
+    /Library/LaunchDaemons/org.freedesktop.avahi-dnsconfd.plist \
+    /Library/LaunchAgents/org.macports.kdecache.plist \
+    /Library/LaunchDaemons/org.macports.mysql5.plist \
+    /Library/LaunchDaemons/org.macports.slapd.plist
+  do
+    if [ -L "${libsymlink}" ] ; then
+      echo "removing symbolic link ${libsymlink}..."
+      sudo rm "${libsymlink}"
+    fi
+  done
 fi
 
 # prepare for a clean installation, remove all cached sources