Minor string fixes in output messages

stablestud · Apr 12, 2018 · 7c26886 · 7c26886
1 parent 45b6196
commit 7c26886
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git a/install-to-system.sh → install_to_system.sh b/install-to-system.sh → install_to_system.sh
diff --git a/adsorber-portable.sh → portable_adsorber.sh b/adsorber-portable.sh → portable_adsorber.sh
diff --git a/remove-from-system.sh → remove_from_system.sh b/remove-from-system.sh → remove_from_system.sh
diff --git a/src/lib/config.sh b/src/lib/config.sh
@@ -169,14 +169,14 @@ config_ReadConfig()
  if [ -z "${http_proxy}" ]; then
  export "${_line}"
  else
- echo "${prefix_warning}Duplicate configuration for 'http_proxy', keeping the first value: ${http_proxy}"
+ echo "${prefix_warning}'http_proxy' already defined, using: ${http_proxy}"
  fi
  ;;
  https_proxy=* )
  if [ -z "${https_proxy}" ]; then
  export "${_line}"
  else
- echo "${prefix_warning}Duplicate configuration for 'https_proxy', keeping the first value: ${https_proxy}"
+ echo "${prefix_warning}'https_proxy' already defined, using: ${https_proxy}"
  fi
  ;;
  hosts_file_path=* )

diff --git a/src/lib/update.sh b/src/lib/update.sh
@@ -180,7 +180,7 @@ update_FetchSources()
  if wget "${_domain}" --show-progress -L --timeout=30 -t 1 -nv -O - >> "${tmp_dir_path}/fetched"; then
  _successful_count=$((_successful_count+1))
  else
- printf "%bwget couldn't fetch: %s\\n" "${prefix_warning}" "${_domain}" 1>&2
+ printf "%bwget couldn't fetch: %s\\n" "${_domain}" 1>&2
  fi
  # Is curl installed? If yes download the hosts files.
  elif command -v curl 2>/dev/null 1>&2; then