diff options
| author | Colin Smith <colin@pfsense.org> | 2005-09-18 20:06:48 +0000 |
|---|---|---|
| committer | Colin Smith <colin@pfsense.org> | 2005-09-18 20:06:48 +0000 |
| commit | 997c3b7a33cd7463f0e84874fee8e6262fa6f608 (patch) | |
| tree | 56e746aef85537de9f27d0060fe89cf181ee683a /etc/inc | |
| parent | bb3b9159f870508f876a36f7806b09c9291ddf8a (diff) | |
| download | pfsense-997c3b7a33cd7463f0e84874fee8e6262fa6f608.zip pfsense-997c3b7a33cd7463f0e84874fee8e6262fa6f608.tar.gz | |
eval() our global functions whether or not install commands or defined. This addresses ticket #471.
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/pkg-utils.inc | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc index 183bbc9..c2bd16a 100644 --- a/etc/inc/pkg-utils.inc +++ b/etc/inc/pkg-utils.inc @@ -573,26 +573,19 @@ function install_package_xml($pkg) { update_output_window($static_output); } /* custom commands */ - if($pkg_config['custom_php_install_command'] <> "") { - $static_output .= "\tCustom commands... "; - update_output_window($static_output); - if($pkg_config['custom_php_global_functions'] <> "") { - eval_once($pkg_config['custom_php_global_functions']); - } - fwrite($fd_log, "Executing post install commands...\n"); - eval_once($pkg_config['custom_php_install_command']); - $static_output .= "done.\n"; - update_output_window($static_output); + $static_output .= "\tCustom commands... "; + update_output_window($static_output); + if($pkg_config['custom_php_global_functions'] <> "") { + eval_once($pkg_config['custom_php_global_functions']); } - /* call our before form property since we may be declaring functions - in it that are called later */ - if($pkg_config['custom_php_command_before_form'] <> "") { - eval_once($pkg_config['custom_php_command_before_form']); + if($pkg_config['custom_php_install_command']) { + eval_once($pkg_config['custom_php_install_command']); } - /* call our resync function */ if($pkg_config['custom_php_resync_config_command'] <> "") { - eval_once($pkg_config['custom_php_resync_config_command']); - } + eval_once($pkg_config['custom_php_resync_config_command']); + } + $static_output .= "done.\n"; + update_output_window($static_output); } else { $static_output .= "Loading package configuration... failed!\n\nInstallation aborted."; update_output_window($static_output); |
