diff options
| author | Devin Teske <dteske@FreeBSD.org> | 2014-03-07 20:24:59 +0000 |
|---|---|---|
| committer | Devin Teske <dteske@FreeBSD.org> | 2014-03-07 20:24:59 +0000 |
| commit | 4bed406fb7c7036771630af96f139968d7332876 (patch) | |
| tree | 6d0c8e0bb39a3add884d75e9e1102c1d0aa7d1ed /usr.sbin/bsdconfig/share | |
| parent | 67602532c32933442edd175ac69a6d805f2e5931 (diff) | |
| download | src-4bed406fb7c7036771630af96f139968d7332876.tar.gz src-4bed406fb7c7036771630af96f139968d7332876.zip | |
Centralize function name. Update a comment while here.
Notes
Notes:
svn path=/head/; revision=262900
Diffstat (limited to 'usr.sbin/bsdconfig/share')
| -rw-r--r-- | usr.sbin/bsdconfig/share/script.subr | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.sbin/bsdconfig/share/script.subr b/usr.sbin/bsdconfig/share/script.subr index 8e55b094df6c..b947e47cff49 100644 --- a/usr.sbin/bsdconfig/share/script.subr +++ b/usr.sbin/bsdconfig/share/script.subr @@ -95,7 +95,7 @@ f_dispatch() # Load a script (usually filled with reswords). If $file is missing or NULL, # use one of the following instead (in order): # -# $configFile +# $configFile (global) # install.cfg # /stand/install.fg # /tmp/install.cfg @@ -107,9 +107,10 @@ f_dispatch() # f_script_load() { + local funcname=f_script_load local script="$1" config_file retval=$SUCCESS - f_dprintf "f_script_load: script=[%s]" "$script" + f_dprintf "$funcname: script=[%s]" "$script" if [ ! "$script" ]; then f_getvar $VAR_CONFIG_FILE config_file for script in \ @@ -129,11 +130,11 @@ f_script_load() setvar $VAR_NONINTERACTIVE yes if [ "$script" = "-" ]; then - f_dprintf "f_script_load: Loading script from stdin" + f_dprintf "$funcname: Loading script from stdin" eval "$( cat )" retval=$? else - f_dprintf "f_script_load: Loading script \`%s'" "$script" + f_dprintf "$funcname: Loading script \`%s'" "$script" if [ ! -e "$script" ]; then f_show_msg "$msg_unable_to_open" "$script" return $FAILURE |