aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2015-04-24 13:54:57 -0300
committerRenato Botelho <garga@FreeBSD.org>2015-04-24 13:54:57 -0300
commitf9fbcf10fb6bad4d83465d82fb7596157f5b3491 (patch)
tree6ed278b117e6c0dc49ba4509ae048cec02a6ea0c
parentab017846b37a5fb036609cda32ae5e2334410f11 (diff)
downloadpfsense-packages-f9fbcf10fb6bad4d83465d82fb7596157f5b3491.tar.gz
pfsense-packages-f9fbcf10fb6bad4d83465d82fb7596157f5b3491.tar.bz2
pfsense-packages-f9fbcf10fb6bad4d83465d82fb7596157f5b3491.zip
Remove ugly copy files around and use additional_files_needed to install files in proper place. Bump package version
-rw-r--r--config/shellcmd/shellcmd.inc16
-rw-r--r--config/shellcmd/shellcmd.php (renamed from config/shellcmd/shellcmd.tmp)0
-rw-r--r--config/shellcmd/shellcmd.xml10
-rw-r--r--config/shellcmd/shellcmd_edit.php (renamed from config/shellcmd/shellcmd_edit.tmp)0
-rw-r--r--pkg_config.10.xml2
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
7 files changed, 8 insertions, 24 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
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 39a42497..1c21f47e 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1155,7 +1155,7 @@
<category>Services</category>
<pkginfolink></pkginfolink>
<config_file>https://packages.pfsense.org/packages/config/shellcmd/shellcmd.xml</config_file>
- <version>0.5</version>
+ <version>0.6</version>
<status>Beta</status>
<required_version>2.2</required_version>
<maintainer>markjcrane@gmail.com</maintainer>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 0f329094..b43feb9c 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1529,7 +1529,7 @@
<category>Services</category>
<pkginfolink></pkginfolink>
<config_file>https://packages.pfsense.org/packages/config/shellcmd/shellcmd.xml</config_file>
- <version>0.5</version>
+ <version>0.6</version>
<status>Beta</status>
<required_version>1.2</required_version>
<maintainer>markjcrane@gmail.com</maintainer>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 9a995679..b39687c8 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1516,7 +1516,7 @@
<category>Services</category>
<pkginfolink></pkginfolink>
<config_file>https://packages.pfsense.org/packages/config/shellcmd/shellcmd.xml</config_file>
- <version>0.5</version>
+ <version>0.6</version>
<status>Beta</status>
<required_version>1.2</required_version>
<maintainer>markjcrane@gmail.com</maintainer>