From cb9e20e554647d9ca6585af0bf7b3d220dda3eef Mon Sep 17 00:00:00 2001 From: William Melody Date: Sat, 18 Apr 2015 21:06:26 -0700 Subject: [PATCH] Use capitalized form of $_ME variable. The capitalized version of this variable makes it easier to override, even though this is not technically part of the external API. There is no known downside of using the capitalized version of the variable. --- hosts | 82 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/hosts b/hosts index c25d5f0..6d8843d 100755 --- a/hosts +++ b/hosts @@ -245,12 +245,12 @@ _debug printf "\$command_parameters: %s\n" "${command_parameters[*]:-}" # Environment ############################################################################### -# $_me +# $_ME # # Set to the program's basename. -_me=$(basename "$0") +_ME=$(basename "$0") -_debug printf "\$_me: %s\n" "$_me" +_debug printf "\$_ME: %s\n" "$_ME" ############################################################################### # Load Commands @@ -475,7 +475,7 @@ _print_desc() { desc version <] + $_ME help [] Description: - Display help information for $_me or a specified command. + Display help information for $_ME or a specified command. EOM help() { if [[ ${#command_argv[@]} = 1 ]]; then @@ -509,26 +509,26 @@ A program for managing host file entries. Version: $_VERSION Usage: - $_me - $_me add [comment] - $_me remove ( | | ) [--force] - $_me list [enabled | disabled | ] - $_me show ( | | ) - $_me disable ( | | ) - $_me disabled - $_me enable ( | | ) - $_me enabled - $_me edit - $_me file - $_me -h | --help - $_me --version + $_ME + $_ME add [comment] + $_ME remove ( | | ) [--force] + $_ME list [enabled | disabled | ] + $_ME show ( | | ) + $_ME disable ( | | ) + $_ME disabled + $_ME enable ( | | ) + $_ME enabled + $_ME edit + $_ME file + $_ME -h | --help + $_ME --version Options: -h --help Display this help information. --version Display version information. Help: - $_me help [] + $_ME help [] $(commands) EOM @@ -541,7 +541,7 @@ EOM desc commands < [comment] + $_ME add [comment] Description: Add a given IP address and hostname pair, along with an optional comment. @@ -600,11 +600,11 @@ add() { local hostname=${2:-} local comment=${*:3} if [[ -z ${ip} ]]; then - $_me help add + $_ME help add exit 1 elif [[ -z ${hostname} ]]; then printf "Please include a hostname\n" - $_me help add + $_ME help add exit 1 elif grep \ -e "^${ip}\t${hostname}$" \ @@ -631,7 +631,7 @@ add() { desc disable < | | ) + $_ME disable ( | | ) Description: Disable one or more records based on a given ip address, hostname, or @@ -641,7 +641,7 @@ disable() { _verify_write_permissions local search_term=$1 if [[ -z "${search_term}" ]]; then - $_me help disable + $_ME help disable exit 1 else @@ -656,20 +656,20 @@ disable() { desc disabled < | | ) + $_ME enable ( | | ) Description: Enable one or more disabled records based on a given ip address, hostname, @@ -697,7 +697,7 @@ enable() { _verify_write_permissions local search_term=$1 if [[ -z "${search_term}" ]]; then - $_me help enable + $_ME help enable exit 1 else target_regex="s/^\#disabled: \(.*${search_term}.*\)$/\1/" @@ -713,20 +713,20 @@ enable() { desc enabled <] + $_ME list [enabled | disabled | ] Description: List the existing IP / hostname pairs, optionally limited to a specified @@ -756,7 +756,7 @@ list() { elif [[ "$1" == enabled ]]; then grep -v -e '^$' -e '^\s*\#' "${HOSTS_PATH}" else - $_me show "$1" + $_ME show "$1" fi else # NOTE: use separate expressions since using a | for the or results in @@ -772,7 +772,7 @@ list() { desc remove < | | ) [--force] + $_ME remove ( | | ) [--force] Options: --force Skip the confirmation prompt. @@ -785,7 +785,7 @@ remove() { _verify_write_permissions local search_string=${1:-} if [[ -z $search_string ]]; then - $_me help remove + $_ME help remove exit 1 else local target_records=$(sed -n "s/^\(.*${search_string}.*\)$/\1/p" "${HOSTS_PATH}") @@ -820,7 +820,7 @@ remove() { desc show < | | ) + $_ME show ( | | ) Description: Print entries matching a given IP address, hostname, or search string. @@ -834,7 +834,7 @@ show() { [[ -n "$enabled_records" ]] && printf "%s\n" "$enabled_records" [[ -n "$disabled_records" ]] && printf "%s\n" "$disabled_records" else - $_me help show + $_ME help show exit 1 fi }