4 files changed, 5 insertions, 21 deletions
diff --git a/config/shellcmd/shellcmd.inc b/config/shellcmd/shellcmd.inc
index c7f50202..c5020d5f 100644
--- a/config/shellcmd/shellcmd.inc
+++ b/config/shellcmd/shellcmd.inc
@@ -71,19 +71,6 @@ function shellcmd_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/shellcmd/')) {
-	   exec("mkdir /usr/local/www/packages/shellcmd/");
-	}
-
-	
-	//rename PHP files from .tmp to .php
-	exec("cp /usr/local/pkg/shellcmd.tmp /usr/local/www/packages/shellcmd/shellcmd.php");
-	exec("cp /usr/local/pkg/shellcmd_edit.tmp /usr/local/www/packages/shellcmd/shellcmd_edit.php");
-		
 	//write_config();
 	  	
 	//write_rcfile(array(
@@ -111,9 +98,6 @@ function shellcmd_deinstall_command()
 	conf_mount_rw();
 	config_lock();
 	$handle = popen("/usr/local/etc/rc.d/shellcmd.sh stop", "r");
-	unlink_if_exists("/usr/local/pkg/shellcmd.xml");
-	unlink_if_exists("/usr/local/www/shellcmd.inc");
-	exec("rm -R /usr/local/www/packages/shellcmd");
 	//unlink_if_exists("/usr/local/etc/rc.d/shellcmd.sh");
 	conf_mount_ro();
 	config_unlock();
diff --git a/config/shellcmd/shellcmd.tmp b/config/shellcmd/shellcmd.php
index fd386910..fd386910 100644
--- a/config/shellcmd/shellcmd.tmp
+++ b/config/shellcmd/shellcmd.php
diff --git a/config/shellcmd/shellcmd.xml b/config/shellcmd/shellcmd.xml
index ca472078..2c154b7a 100644
--- a/config/shellcmd/shellcmd.xml
+++ b/config/shellcmd/shellcmd.xml
@@ -75,14 +75,14 @@
 		<item>https://packages.pfsense.org/packages/config/shellcmd/shellcmd.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<prefix>/usr/local/pkg/</prefix>
+		<prefix>/usr/local/packages/shellcmd/</prefix>
 		<chmod>0755</chmod>		
-		<item>https://packages.pfsense.org/packages/config/shellcmd/shellcmd.tmp</item>
+		<item>https://packages.pfsense.org/packages/config/shellcmd/shellcmd.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<prefix>/usr/local/pkg/</prefix>
+		<prefix>/usr/local/packages/shellcmd/</prefix>
 		<chmod>0755</chmod>		
-		<item>https://packages.pfsense.org/packages/config/shellcmd/shellcmd_edit.tmp</item>
+		<item>https://packages.pfsense.org/packages/config/shellcmd/shellcmd_edit.php</item>
 	</additional_files_needed>			
 	<fields>
 		<field>
@@ -112,4 +112,4 @@
 	<custom_php_deinstall_command>
 		shellcmd_deinstall_command();
 	</custom_php_deinstall_command>
-</packagegui>
-\ No newline at end of file
+</packagegui>
diff --git a/config/shellcmd/shellcmd_edit.tmp b/config/shellcmd/shellcmd_edit.php
index 5ae466d5..5ae466d5 100644
--- a/config/shellcmd/shellcmd_edit.tmp
+++ b/config/shellcmd/shellcmd_edit.php