octoleo/hosts
1
0
Fork 0
mirror of https://github.com/octoleo/hosts.git synced 2024-11-25 14:17:48 +00:00
Code Releases Activity

Use explicit escaping for backslashes in all contexts.

Browse Source 
ShellCheck SC1117
https://github.com/koalaman/shellcheck/wiki/SC1117
This commit is contained in:
William Melody 2018-04-15 15:01:34 -07:00
parent 80edd464b6
commit 746780fbbe
1 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
hosts
View File

@ -596,9 +596,9 @@ help() {
cat <<HEREDOC cat <<HEREDOC
__ __ __ __
/ /_ ____ _____/ /______ / /_ ____ _____/ /______
/ __ \/ __ \/ ___/ __/ ___/ / __ \\/ __ \\/ ___/ __/ ___/
/ / / / /_/ (__ ) /_(__ ) / / / / /_/ (__ ) /_(__ )
/_/ /_/\____/____/\__/____/ /_/ /_/\\____/____/\\__/____/
A program for managing host file entries. A program for managing host file entries.
@ -715,8 +715,8 @@ add() {
${_ME} help add ${_ME} help add
exit 1 exit 1
elif grep \ elif grep \
-e "^${ip}\t${hostname}$" \ -e "^${ip}\\t${hostname}$" \
-e "^${ip}\t${hostname}\t.*$" "${HOSTS_PATH}" -e "^${ip}\\t${hostname}\\t.*$" "${HOSTS_PATH}"
then then
_die printf \ _die printf \
"Duplicate address/host combination, %s unchanged.\\n" \ "Duplicate address/host combination, %s unchanged.\\n" \
@ -726,19 +726,19 @@ add() {
then then
local formatted_comment local formatted_comment
formatted_comment=$(_join " " "${comment[@]}") formatted_comment=$(_join " " "${comment[@]}")
printf "%s\t%s\t# %s\\n" \ printf "%s\\t%s\\t# %s\\n" \
"${ip}" \ "${ip}" \
"${hostname}" \ "${hostname}" \
"${formatted_comment}" >> "${HOSTS_PATH}" "${formatted_comment}" >> "${HOSTS_PATH}"
printf "Added:\\n%s\t%s\t# %s\\n" \ printf "Added:\\n%s\\t%s\\t# %s\\n" \
"${ip}" \ "${ip}" \
"${hostname}" \ "${hostname}" \
"${formatted_comment}" "${formatted_comment}"
else else
printf "%s\t%s\\n" \ printf "%s\\t%s\\n" \
"${ip}" \ "${ip}" \
"${hostname}" >> "${HOSTS_PATH}" "${hostname}" >> "${HOSTS_PATH}"
printf "Added:\\n%s\t%s\\n" \ printf "Added:\\n%s\\t%s\\n" \
"${ip}" \ "${ip}" \
"${hostname}" "${hostname}"
fi fi
@ -789,9 +789,9 @@ disable() {
else else
_debug printf "disable() \${search_string}: %s\\n" "${search_string}" _debug printf "disable() \${search_string}: %s\\n" "${search_string}"
target_regex_ip="^\(${search_string}[${_TAB_SPACE_}]..*\)$" target_regex_ip="^\\(${search_string}[${_TAB_SPACE_}]..*\\)$"
target_regex_commented_hostname="^\([^#]..*[${_TAB_SPACE_}]${search_string}[${_TAB_SPACE_}]..*\)$" target_regex_commented_hostname="^\\([^#]..*[${_TAB_SPACE_}]${search_string}[${_TAB_SPACE_}]..*\\)$"
target_regex_hostname="^\([^#]..*[${_TAB_SPACE_}]${search_string}\)$" target_regex_hostname="^\\([^#]..*[${_TAB_SPACE_}]${search_string}\\)$"
# Regular Expression Notes # Regular Expression Notes
# #
@ -800,9 +800,9 @@ disable() {
local targets local targets
targets=$( targets=$(
sed -n \ sed -n \
-e "s/${target_regex_ip}/\1/p" \ -e "s/${target_regex_ip}/\\1/p" \
-e "s/${target_regex_commented_hostname}/\1/p" \ -e "s/${target_regex_commented_hostname}/\\1/p" \
-e "s/${target_regex_hostname}/\1/p" \ -e "s/${target_regex_hostname}/\\1/p" \
"${HOSTS_PATH}" "${HOSTS_PATH}"
) )
_debug printf "disable() \${targets}: %s\\n" "${targets}" _debug printf "disable() \${targets}: %s\\n" "${targets}"
@ -816,9 +816,9 @@ disable() {
# -i '' - in place edit. BSD sed requires extension argument, for GNU # -i '' - in place edit. BSD sed requires extension argument, for GNU
# it's optional. More info: http://stackoverflow.com/a/16746032 # it's optional. More info: http://stackoverflow.com/a/16746032
sed -i '' \ sed -i '' \
-e "s/${target_regex_ip}/\#disabled: \1/g" \ -e "s/${target_regex_ip}/\\#disabled: \\1/g" \
-e "s/${target_regex_commented_hostname}/\#disabled: \1/g" \ -e "s/${target_regex_commented_hostname}/\\#disabled: \\1/g" \
-e "s/${target_regex_hostname}/\#disabled: \1/g" \ -e "s/${target_regex_hostname}/\\#disabled: \\1/g" \
"${HOSTS_PATH}" "${HOSTS_PATH}"
fi fi
} }
@ -875,9 +875,9 @@ enable() {
else else
_debug printf "enable() \${search_string}: %s\\n" "${search_string}" _debug printf "enable() \${search_string}: %s\\n" "${search_string}"
target_regex_ip="^\#disabled: \(${search_string}[${_TAB_SPACE_}]..*\)$" target_regex_ip="^\\#disabled: \\(${search_string}[${_TAB_SPACE_}]..*\\)$"
target_regex_commented_hostname="^\#disabled: \(..*[${_TAB_SPACE_}]${search_string}[${_TAB_SPACE_}]..*\)$" target_regex_commented_hostname="^\\#disabled: \\(..*[${_TAB_SPACE_}]${search_string}[${_TAB_SPACE_}]..*\\)$"
target_regex_hostname="^\#disabled: \(..*[${_TAB_SPACE_}]${search_string}\)$" target_regex_hostname="^\\#disabled: \\(..*[${_TAB_SPACE_}]${search_string}\\)$"
# Regular Expression Notes # Regular Expression Notes
# #
@ -886,9 +886,9 @@ enable() {
local targets local targets
targets=$( targets=$(
sed -n \ sed -n \
-e "s/${target_regex_ip}/\1/p" \ -e "s/${target_regex_ip}/\\1/p" \
-e "s/${target_regex_commented_hostname}/\1/p" \ -e "s/${target_regex_commented_hostname}/\\1/p" \
-e "s/${target_regex_hostname}/\1/p" \ -e "s/${target_regex_hostname}/\\1/p" \
"${HOSTS_PATH}" "${HOSTS_PATH}"
) )
_debug printf "enable() \${targets}: %s\\n" "${targets}" _debug printf "enable() \${targets}: %s\\n" "${targets}"
@ -902,9 +902,9 @@ enable() {
# -i '' - in place edit. BSD sed requires extension argument, for GNU # -i '' - in place edit. BSD sed requires extension argument, for GNU
# it's optional. More info: http://stackoverflow.com/a/16746032 # it's optional. More info: http://stackoverflow.com/a/16746032
sed -i '' \ sed -i '' \
-e "s/${target_regex_ip}/\1/g" \ -e "s/${target_regex_ip}/\\1/g" \
-e "s/${target_regex_commented_hostname}/\1/g" \ -e "s/${target_regex_commented_hostname}/\\1/g" \
-e "s/${target_regex_hostname}/\1/g" \ -e "s/${target_regex_hostname}/\\1/g" \
"${HOSTS_PATH}" "${HOSTS_PATH}"
fi fi
} }
@ -950,7 +950,7 @@ list() {
# Get the disabled records up front for the two cases where they are needed. # Get the disabled records up front for the two cases where they are needed.
local disabled_records local disabled_records
disabled_records=$( disabled_records=$(
sed -n "s/^\#disabled: \(.*\)$/\1/p" "${HOSTS_PATH}" sed -n "s/^\\#disabled: \\(.*\\)$/\\1/p" "${HOSTS_PATH}"
) )
if [[ -n "${1}" ]] if [[ -n "${1}" ]]
@ -1039,12 +1039,12 @@ remove() {
# which apparently doesn't work properly with all versions of sed. # which apparently doesn't work properly with all versions of sed.
# #
# IP / Hostname pair regular expressions: # IP / Hostname pair regular expressions:
local target_regex_ip_hostname_commented="^\(${search_ip}[${_TAB_SPACE_}]*${search_hostname}[${_TAB_SPACE_}]..*\)$" local target_regex_ip_hostname_commented="^\\(${search_ip}[${_TAB_SPACE_}]*${search_hostname}[${_TAB_SPACE_}]..*\\)$"
local target_regex_ip_hostname="^\(${search_ip}[${_TAB_SPACE_}]*${search_hostname}\)$" local target_regex_ip_hostname="^\\(${search_ip}[${_TAB_SPACE_}]*${search_hostname}\\)$"
# Search string regular expressions: # Search string regular expressions:
local target_regex_ip="^\(${search_string}[${_TAB_SPACE_}]..*\)$" local target_regex_ip="^\\(${search_string}[${_TAB_SPACE_}]..*\\)$"
local target_regex_commented_hostname="^\(..*[${_TAB_SPACE_}]${search_string}[${_TAB_SPACE_}]..*\)$" local target_regex_commented_hostname="^\\(..*[${_TAB_SPACE_}]${search_string}[${_TAB_SPACE_}]..*\\)$"
local target_regex_hostname="^\(..*[${_TAB_SPACE_}]${search_string}\)$" local target_regex_hostname="^\\(..*[${_TAB_SPACE_}]${search_string}\\)$"
local target_records local target_records
@ -1052,16 +1052,16 @@ remove() {
then then
target_records=$( target_records=$(
sed -n \ sed -n \
-e "s/${target_regex_ip_hostname_commented}/\1/p" \ -e "s/${target_regex_ip_hostname_commented}/\\1/p" \
-e "s/${target_regex_ip_hostname}/\1/p" \ -e "s/${target_regex_ip_hostname}/\\1/p" \
"${HOSTS_PATH}" "${HOSTS_PATH}"
) )
else else
target_records=$( target_records=$(
sed -n \ sed -n \
-e "s/${target_regex_ip}/\1/p" \ -e "s/${target_regex_ip}/\\1/p" \
-e "s/${target_regex_commented_hostname}/\1/p" \ -e "s/${target_regex_commented_hostname}/\\1/p" \
-e "s/${target_regex_hostname}/\1/p" \ -e "s/${target_regex_hostname}/\\1/p" \
"${HOSTS_PATH}" "${HOSTS_PATH}"
) )
fi fi
@ -1143,7 +1143,7 @@ show() {
# Run `sed` before `grep` to avoid conflict that supress `sed` output. # Run `sed` before `grep` to avoid conflict that supress `sed` output.
local disabled_records local disabled_records
disabled_records=$( disabled_records=$(
sed -n "s/^\#\(disabled: .*${1}.*\)$/\1/p" "${HOSTS_PATH}" sed -n "s/^\\#\\(disabled: .*${1}.*\\)$/\\1/p" "${HOSTS_PATH}"
) )
local enabled_records local enabled_records
enabled_records=$( enabled_records=$(