[csw-devel] SF.net SVN: gar:[4673] csw/mgar/pkg/squid/trunk

[valholla at users.sourceforge.net]

Revision: 4673
          http://gar.svn.sourceforge.net/gar/?rev=4673&view=rev
Author:   valholla
Date:     2009-05-04 21:31:07 +0000 (Mon, 04 May 2009)

Log Message:
-----------
post-install fixes

Modified Paths:
--------------
    csw/mgar/pkg/squid/trunk/Makefile
    csw/mgar/pkg/squid/trunk/files/cswsquid

Modified: csw/mgar/pkg/squid/trunk/Makefile
===================================================================
--- csw/mgar/pkg/squid/trunk/Makefile	2009-05-04 21:23:09 UTC (rev 4672)
+++ csw/mgar/pkg/squid/trunk/Makefile	2009-05-04 21:31:07 UTC (rev 4673)
@@ -55,6 +55,7 @@
 
 post-install-modulated:
 	ginstall -d $(DESTDIR)/etc/opt/csw/init.d
+	ginstall -d $(DESTDIR)$(localstatedir)/cache
 	gcp $(DOWNLOADDIR)/cswsquid $(DESTDIR)/etc/opt/csw/init.d/
 	chmod 0755 $(DESTDIR)/etc/opt/csw/init.d/cswsquid
 	gmv $(DESTDIR)$(sysconfdir)/squid.conf \

Modified: csw/mgar/pkg/squid/trunk/files/cswsquid
===================================================================
--- csw/mgar/pkg/squid/trunk/files/cswsquid	2009-05-04 21:23:09 UTC (rev 4672)
+++ csw/mgar/pkg/squid/trunk/files/cswsquid	2009-05-04 21:31:07 UTC (rev 4673)
@@ -10,7 +10,7 @@
 case "$1" in
     'start')
         if [ -x ${SQUID_DAEMON} -a -f ${SQUID_CONF} ]; then
-            if [ -n "`pgrep squid`" ]; then
+            if [ -n "`pgrep /squid`" ]; then
                 echo 'squid server is already running'
 	            exit 0
             else
@@ -28,11 +28,11 @@
         ;;
     'stop')
         if [ -x ${SQUID_DAEMON} -a -f ${SQUID_CONF} ]; then
-            if [ -n "`pgrep squid`" ]; then
+            if [ -n "`pgrep /squid`" ]; then
                 ## stop gracefully
 	            echo 'stopping squid server... please wait for cleanup...'
                 ${SQUID_DAEMON} -k shutdown && sleep 30
-                if [ -n "`pgrep squid`" ]; then
+                if [ -n "`pgrep /squid`" ]; then
                     echo 'squid server still running, killing...'
                     pkill -9 squid
                 fi


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.