From dcf9e96aa3a3530b6f0e6afba8dc0c102b89dd51 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Thu, 02 Jul 2020 18:36:56 -0400 Subject: Prefix "static" vars with "_" --- (limited to 'src/cmd.sh') diff --git a/src/cmd.sh b/src/cmd.sh index b95a302..0742fb4 100644 --- a/src/cmd.sh +++ b/src/cmd.sh @@ -18,16 +18,16 @@ # along with the ProteanOS Development Kit. If not, see # . -cmds=' ' -running_cmd= -running_cmd_clean= +_cmds=' ' +_cmd_running= +_cmd_running_clean= register_cmd() { local cmd="${1}" shift 1 - cmds="${cmds}${cmd} " + _cmds="${_cmds}${cmd} " return 0 } @@ -68,7 +68,7 @@ print_cmd_summaries() local summary= padding="$(printf '%24s' '')" - for cmd in ${cmds}; do + for cmd in ${_cmds}; do if [ ${#cmd} -gt 20 ]; then printf ' %s\n%24s' "${cmd}" '' else @@ -101,7 +101,7 @@ is_cmd() local cmd="${1}" shift 1 - case "${cmds}" in *" ${cmd} "*) return 0;; *) return 1;; esac + case "${_cmds}" in *" ${cmd} "*) return 0;; *) return 1;; esac } run_cmd() @@ -114,12 +114,12 @@ run_cmd() cmd_clean="$(printf '%s' "${cmd}" | \ tr '[A-Z]' '[a-z]' | tr -C '[a-z0-9_]' '_')" if is_cmd "${cmd}"; then - running_cmd="${cmd}" - running_cmd_clean="${cmd_clean}" + _cmd_running="${cmd}" + _cmd_running_clean="${cmd_clean}" es=0 "cmd_${cmd_clean}_main" "${@}" || es=${?} - running_cmd='' - running_cmd_clean='' + _cmd_running='' + _cmd_running_clean='' else error "$(get_msg 'cmd_not_found')" "${cmd}" return 1 -- cgit v0.9.1