From 9a77cafd7e400640a855f8f5112dd59c93af92a7 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Fri, 10 Dec 2010 12:48:58 +0000
Subject: Fix all this packages from their copy/paste legacy. Mostly protect
 poorly choosen function names with function_exists.

---
 config/shellcmd/shellcmd.inc | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

(limited to 'config/shellcmd')

diff --git a/config/shellcmd/shellcmd.inc b/config/shellcmd/shellcmd.inc
index 4d9a82ca..c7f50202 100644
--- a/config/shellcmd/shellcmd.inc
+++ b/config/shellcmd/shellcmd.inc
@@ -31,21 +31,23 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-require("services.inc");
-
-function pkg_is_service_running($servicename)
-{
-    exec("/bin/ps ax | awk '{ print $5 }'", $psout);
-    array_shift($psout);
-    foreach($psout as $line) {
-    	$ps[] = trim(array_pop(explode(' ', array_pop(explode('/', $line)))));
-    }
-    if(is_service_running($servicename, $ps) or is_process_running($servicename) ) {
-        return true;
-    }
-    else {
-        return false;
-    }
+require_once("services.inc");
+
+if (!function_exists("pkg_is_service_running")) {
+	function pkg_is_service_running($servicename)
+	{
+	    exec("/bin/ps ax | awk '{ print $5 }'", $psout);
+	    array_shift($psout);
+	    foreach($psout as $line) {
+		$ps[] = trim(array_pop(explode(' ', array_pop(explode('/', $line)))));
+	    }
+	    if(is_service_running($servicename, $ps) or is_process_running($servicename) ) {
+		return true;
+	    }
+	    else {
+		return false;
+	    }
+	}
 }
 
 function shellcmd_sync_package()
@@ -118,4 +120,4 @@ function shellcmd_deinstall_command()
 	
 }
 
-?>
\ No newline at end of file
+?>
-- 
cgit v1.2.3