From 07213c013d998d5d98f6fe37a8f0004a7a3c6717 Mon Sep 17 00:00:00 2001
From: Mark Crane <mcrane@pfsense.org>
Date: Thu, 22 Jan 2009 22:58:28 +0000
Subject: phpservice package work on installation take 3

---
 packages/phpservice/phpservice.inc | 8 ++++----
 packages/phpservice/phpservice.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'packages/phpservice')

diff --git a/packages/phpservice/phpservice.inc b/packages/phpservice/phpservice.inc
index 8324768d..9acb7037 100644
--- a/packages/phpservice/phpservice.inc
+++ b/packages/phpservice/phpservice.inc
@@ -156,10 +156,6 @@ function phpservice_sync_package()
 	global $config;   
 	phpservice_sync_package_php();
 
-	if (!is_dir('/usr/local/www/packages/phpservice/')) {
-	   exec("mkdir /usr/local/www/packages/phpservice/");
-	}
-
 }
     
 
@@ -170,6 +166,10 @@ function php_install_command()
 	conf_mount_rw();
 	config_lock();
 
+	if (!is_dir('/usr/local/www/packages/')) {
+	   exec("mkdir /usr/local/www/packages/");
+	}
+	
 	if (!is_dir('/usr/local/www/packages/phpservice/')) {
 	   exec("mkdir /usr/local/www/packages/phpservice/");
 	}
diff --git a/packages/phpservice/phpservice.xml b/packages/phpservice/phpservice.xml
index 211e9554..68f01961 100644
--- a/packages/phpservice/phpservice.xml
+++ b/packages/phpservice/phpservice.xml
@@ -49,7 +49,7 @@
 		<tooltiptext>PHP Service settings.</tooltiptext>
 		<section>Services</section>
 		<configfile>phpservice.xml</configfile>
-		<url>/packages/phpservice_php.php</url>
+		<url>/packages/phpservice/phpservice_php.php</url>
 	</menu>
 	<service>
 		<name>PHPService</name>
-- 
cgit v1.2.3