diff --git a/scripts/install-multi-user.sh b/scripts/install-multi-user.sh index 1dbb93bf9..ad3ee8881 100644 --- a/scripts/install-multi-user.sh +++ b/scripts/install-multi-user.sh @@ -58,31 +58,6 @@ readonly EXTRACTED_NIX_PATH="$(dirname "$0")" readonly ROOT_HOME=~root -readonly PROXY_ENVIRONMENT_VARIABLES=( - http_proxy - https_proxy - ftp_proxy - no_proxy - HTTP_PROXY - HTTPS_PROXY - FTP_PROXY - NO_PROXY -) - -SUDO_EXTRA_ENVIRONMENT_VARIABLES=() - -setup_sudo_extra_environment_variables() { - local i=${#SUDO_EXTRA_ENVIRONMENT_VARIABLES[@]} - for variable in "${PROXY_ENVIRONMENT_VARIABLES[@]}"; do - if [ "x${!variable:-}" != "x" ]; then - SUDO_EXTRA_ENVIRONMENT_VARIABLES[i]="$variable=${!variable}" - i=$((i + 1)) - fi - done -} - -setup_sudo_extra_environment_variables - if [ -t 0 ] && [ -z "${NIX_INSTALLER_YES:-}" ]; then readonly IS_HEADLESS='no' else @@ -386,7 +361,7 @@ _sudo() { if is_root; then env "$@" else - sudo "${SUDO_EXTRA_ENVIRONMENT_VARIABLES[@]}" "$@" + sudo "$@" fi }