diff options
| author | jim-p <jimp@pfsense.org> | 2010-11-09 15:13:40 -0500 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2010-11-09 15:13:40 -0500 |
| commit | e284125663f36249ac6ee8c16e5b09878a035307 (patch) | |
| tree | bc731f1500945eacf1cffa4f3241f40a6a372199 | |
| parent | e73357ec940a870acc880ffb72673c50cdfcb249 (diff) | |
| download | pfsense-packages-e284125663f36249ac6ee8c16e5b09878a035307.tar.gz pfsense-packages-e284125663f36249ac6ee8c16e5b09878a035307.tar.bz2 pfsense-packages-e284125663f36249ac6ee8c16e5b09878a035307.zip | |
Unique function names.
| -rw-r--r-- | config/shellcmd/shellcmd.inc | 10 | ||||
| -rw-r--r-- | config/shellcmd/shellcmd.xml | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/config/shellcmd/shellcmd.inc b/config/shellcmd/shellcmd.inc index cd46ada5..4d9a82ca 100644 --- a/config/shellcmd/shellcmd.inc +++ b/config/shellcmd/shellcmd.inc @@ -33,7 +33,7 @@ require("services.inc"); -function pkg_is_service_running($servicename) +function pkg_is_service_running($servicename) { exec("/bin/ps ax | awk '{ print $5 }'", $psout); array_shift($psout); @@ -48,7 +48,7 @@ function pkg_is_service_running($servicename) } } -function php_sync_package() +function shellcmd_sync_package() { global $config; @@ -62,7 +62,7 @@ function php_sync_package() } -function php_install_command() +function shellcmd_install_command() { global $config; @@ -91,7 +91,7 @@ function php_install_command() // ) //); - php_sync_package(); + shellcmd_sync_package(); //if (pkg_is_service_running('shellcmd')) { //documentation purposes @@ -103,7 +103,7 @@ function php_install_command() } -function deinstall_command() +function shellcmd_deinstall_command() { conf_mount_rw(); diff --git a/config/shellcmd/shellcmd.xml b/config/shellcmd/shellcmd.xml index a4b67c7a..f478a6c2 100644 --- a/config/shellcmd/shellcmd.xml +++ b/config/shellcmd/shellcmd.xml @@ -101,15 +101,15 @@ <custom_add_php_command> </custom_add_php_command> <custom_php_resync_config_command> - php_sync_package(); + shellcmd_sync_package(); </custom_php_resync_config_command> <custom_delete_php_command> - php_sync_package(); + shellcmd_sync_package(); </custom_delete_php_command> <custom_php_install_command> - php_install_command(); + shellcmd_install_command(); </custom_php_install_command> <custom_php_deinstall_command> - deinstall_command(); + shellcmd_deinstall_command(); </custom_php_deinstall_command> </packagegui>
\ No newline at end of file |