diff --git a/lib/dns.sh b/lib/dns.sh index f087cfa..4a76c77 100644 --- a/lib/dns.sh +++ b/lib/dns.sh @@ -78,13 +78,13 @@ raw_to_json_obj() { json_array_to_bash() { local retvar=${1:-REPLY} - local __values=() + local _values=() while IFS=$NEWLINE read -r line; do - __values+=("$("$JQ" --raw-output --compact-output '.[] | @sh' <<<"$line")") + _values+=("$("$JQ" --raw-output --compact-output '.[] | @sh' <<<"$line")") done < <(cat -) declare -g -a $retvar - eval "$retvar=(${__values[@]})" + eval "$retvar=(${_values[@]})" } bash_array_to_json() { @@ -164,15 +164,15 @@ dns_get_base_config() { local base_config=${BASE_CONFIG[$view]} [ -z "$base_config" ] && echo "ERROR: no base config found for view -- '$view'" >&2 && return 1 - local __zone_dir __conf_dir __conf_file - IFS=":" read -r __zone_dir __conf_dir __conf_file <<<"$base_config" - [ -z "$__zone_dir" -o -z "$__conf_dir" -o -z "$__conf_file" ] && echo "ERROR: invalid BASE_CONFIG for view -- '$view'" >&2 && return 2 - ! [ -d "$__conf_dir" ] && echo "ERROR: conf dir: no such directory -- '$__conf_dir'" >&2 && return 3 - ! [ -d "$__zone_dir" ] && echo "ERROR: zone dir: no such directory -- '$__zone_dir'" >&2 && return 4 + local zone_dir conf_dir conf_file + IFS=":" read -r zone_dir conf_dir conf_file <<<"$base_config" + [ -z "$zone_dir" -o -z "$conf_dir" -o -z "$conf_file" ] && echo "ERROR: invalid BASE_CONFIG for view -- '$view'" >&2 && return 2 + ! [ -d "$conf_dir" ] && echo "ERROR: conf dir: no such directory -- '$conf_dir'" >&2 && return 3 + ! [ -d "$zone_dir" ] && echo "ERROR: zone dir: no such directory -- '$zone_dir'" >&2 && return 4 - declare -g $zone_dir_retvar="$__zone_dir" - declare -g $conf_dir_retvar="$__conf_dir" - declare -g $conf_file_retvar="$__conf_file" + declare -g $zone_dir_retvar="$zone_dir" + declare -g $conf_dir_retvar="$conf_dir" + declare -g $conf_file_retvar="$conf_file" }