From 9c52365bf77501b329f05f9d6ff166b3d03c988b Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Fri, 7 Jan 2011 13:00:05 -0500
Subject: Fix cron package install for 1.2.x

---
 config/cron/cron.inc | 10 +++-------
 config/cron/cron.xml |  4 ++--
 2 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'config')

diff --git a/config/cron/cron.inc b/config/cron/cron.inc
index 198e41db..e5df104a 100644
--- a/config/cron/cron.inc
+++ b/config/cron/cron.inc
@@ -69,17 +69,13 @@ function cron_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/cron/')) {
-		exec("mkdir /usr/local/www/packages/cron/");
+		exec("mkdir -p /usr/local/www/packages/cron/");
 	}
 
 	//Copy PHP files from .tmp to .php - don't move or put them in /tmp or the pkg system will miss them if it gets cleared.
-	exec("cp /usr/local/www/packages/cron/cron.tmp /usr/local/www/packages/cron/cron.php");
-	exec("cp /usr/local/www/packages/cron/cron_edit.tmp /usr/local/www/packages/cron/cron_edit.php");
+	exec("cp /usr/local/pkg/cron.tmp /usr/local/www/packages/cron/cron.php");
+	exec("cp /usr/local/pkg/cron_edit.tmp /usr/local/www/packages/cron/cron_edit.php");
 
 	//write_config();
 
diff --git a/config/cron/cron.xml b/config/cron/cron.xml
index 69226739..710af132 100644
--- a/config/cron/cron.xml
+++ b/config/cron/cron.xml
@@ -76,12 +76,12 @@
 		<item>http://www.pfsense.com/packages/config/cron/cron.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<prefix>/usr/local/www/packages/cron/</prefix>
+		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>		
 		<item>http://www.pfsense.com/packages/config/cron/cron.tmp</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<prefix>/usr/local/www/packages/cron/</prefix>
+		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>		
 		<item>http://www.pfsense.com/packages/config/cron/cron_edit.tmp</item>
 	</additional_files_needed>
-- 
cgit v1.2.3