[90334] trunk/dports/net

[jmr at macports.org]

Revision: 90334
          http://trac.macports.org/changeset/90334
Author:   jmr at macports.org
Date:     2012-03-02 10:50:41 -0800 (Fri, 02 Mar 2012)
Log Message:
-----------
squid, squid3: improved startupitem commands (#33436)

Modified Paths:
--------------
    trunk/dports/net/squid/Portfile
    trunk/dports/net/squid3/Portfile

Modified: trunk/dports/net/squid/Portfile
===================================================================
--- trunk/dports/net/squid/Portfile	2012-03-02 15:21:39 UTC (rev 90333)
+++ trunk/dports/net/squid/Portfile	2012-03-02 18:50:41 UTC (rev 90334)
@@ -73,12 +73,15 @@
 startupitem.start \
     "cd ${prefix}/var/squid" \
     "if \[ ! -d \"${prefix}/var/squid/cache/00\" \]; then" \
-    "\tsu -fm root -c \"exec ${prefix}/sbin/squid -s -z\"" \
+    "    ${prefix}/sbin/squid -s -z" \
     "fi" \
-    "su -fm root -c \"exec ${prefix}/sbin/squid -s\""
+    "${prefix}/sbin/squid -s"
 startupitem.stop \
     "cd ${prefix}/var/squid" \
-    "su -fm root -c \"exec ${prefix}/sbin/squid -k shutdown\""
+    "${prefix}/sbin/squid -k shutdown" \
+    "while ${prefix}/sbin/squid -k check; do" \
+    "    sleep 1" \
+    "done"
 
 add_users       squid group=squid home=${prefix}/var/squid
 

Modified: trunk/dports/net/squid3/Portfile
===================================================================
--- trunk/dports/net/squid3/Portfile	2012-03-02 15:21:39 UTC (rev 90333)
+++ trunk/dports/net/squid3/Portfile	2012-03-02 18:50:41 UTC (rev 90334)
@@ -80,12 +80,15 @@
 startupitem.start \
     "cd ${prefix}/var/squid" \
     "if \[ ! -d \"${prefix}/var/squid/cache/00\" \]; then" \
-    "\tsu -fm root -c \"exec ${prefix}/sbin/squid -s -z\"" \
+    "    ${prefix}/sbin/squid -s -z" \
     "fi" \
-    "su -fm root -c \"exec ${prefix}/sbin/squid -s\""
+    "${prefix}/sbin/squid -s"
 startupitem.stop \
     "cd ${prefix}/var/squid" \
-    "su -fm root -c \"exec ${prefix}/sbin/squid -k shutdown\""
+    "${prefix}/sbin/squid -k shutdown" \
+    "while ${prefix}/sbin/squid -k check; do" \
+    "    sleep 1" \
+    "done"
 
 add_users       squid group=squid home=${prefix}/var/squid
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120302/1df3fd84/attachment.html>