From db4df46caab73be8ac662d25122835e246d9c0cc Mon Sep 17 00:00:00 2001 From: William Melody Date: Sat, 12 Sep 2015 16:17:50 -0700 Subject: [PATCH] Rename `search_term` to `search_string` in `enable` and `disable`. `search_string` is slightly more descriptive, and it's the name that's used in `remove`. --- hosts | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/hosts b/hosts index 74051b3..cb0e7aa 100755 --- a/hosts +++ b/hosts @@ -723,17 +723,17 @@ Description: EOM disable() { _verify_write_permissions - local search_term=$1 - if [[ -z "${search_term}" ]] + local search_string=$1 + if [[ -z "${search_string}" ]] then $_ME help disable exit 1 else - _debug printf "disable() \$search_term: %s\n" "$search_term" + _debug printf "disable() \$search_string: %s\n" "$search_string" - target_regex_ip="^\(${search_term}[${_TAB_SPACE_}]..*\)$" - target_regex_commented_hostname="^\([^#]..*[${_TAB_SPACE_}]${search_term}[${_TAB_SPACE_}]..*\)$" - target_regex_hostname="^\([^#]..*[${_TAB_SPACE_}]${search_term}\)$" + target_regex_ip="^\(${search_string}[${_TAB_SPACE_}]..*\)$" + target_regex_commented_hostname="^\([^#]..*[${_TAB_SPACE_}]${search_string}[${_TAB_SPACE_}]..*\)$" + target_regex_hostname="^\([^#]..*[${_TAB_SPACE_}]${search_string}\)$" # Regular Expression Notes # @@ -750,7 +750,7 @@ disable() { _debug printf "disable() \$targets: %s\n" "$targets" if [[ -z "${targets}" ]] then - _die printf "Not found: %s\n" "${search_term}" + _die printf "Not found: %s\n" "${search_string}" fi printf "Disabling:\n%s\n" "${targets}" @@ -809,17 +809,17 @@ Description: EOM enable() { _verify_write_permissions - local search_term=$1 - if [[ -z "${search_term}" ]] + local search_string=$1 + if [[ -z "${search_string}" ]] then $_ME help enable exit 1 else - _debug printf "enable() \$search_term: %s\n" "$search_term" + _debug printf "enable() \$search_string: %s\n" "$search_string" - target_regex_ip="^\#disabled: \(${search_term}[${_TAB_SPACE_}]..*\)$" - target_regex_commented_hostname="^\#disabled: \(..*[${_TAB_SPACE_}]${search_term}[${_TAB_SPACE_}]..*\)$" - target_regex_hostname="^\#disabled: \(..*[${_TAB_SPACE_}]${search_term}\)$" + target_regex_ip="^\#disabled: \(${search_string}[${_TAB_SPACE_}]..*\)$" + target_regex_commented_hostname="^\#disabled: \(..*[${_TAB_SPACE_}]${search_string}[${_TAB_SPACE_}]..*\)$" + target_regex_hostname="^\#disabled: \(..*[${_TAB_SPACE_}]${search_string}\)$" # Regular Expression Notes # @@ -836,7 +836,7 @@ enable() { _debug printf "enable() \$targets: %s\n" "$targets" if [[ -z "${targets}" ]] then - _die printf "Not found: %s\n" "${search_term}" + _die printf "Not found: %s\n" "${search_string}" fi printf "Enabling:\n%s\n" "${targets}"