nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-25 08:12:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix sudo in the darwin installer (#10128)"

Browse Source 
This reverts commit 686405ef41.
This commit is contained in:
Théophane Hufschmitt 2024-03-07 08:47:58 +01:00 committed by GitHub
parent 0a11080c58
commit be628646ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/install-multi-user.sh
View File

@ -69,17 +69,16 @@ readonly PROXY_ENVIRONMENT_VARIABLES=(
NO_PROXY NO_PROXY
) )
SUDO_KEPT_ENVIRONMENT_VARIABLES="" SUDO_EXTRA_ENVIRONMENT_VARIABLES=()
setup_sudo_extra_environment_variables() { setup_sudo_extra_environment_variables() {
local i=${#SUDO_EXTRA_ENVIRONMENT_VARIABLES[@]}
for variable in "${PROXY_ENVIRONMENT_VARIABLES[@]}"; do for variable in "${PROXY_ENVIRONMENT_VARIABLES[@]}"; do
if [ "x${!variable:-}" != "x" ]; then if [ "x${!variable:-}" != "x" ]; then
SUDO_KEPT_ENVIRONMENT_VARIABLES="$SUDO_KEPT_ENVIRONMENT_VARIABLES,$variable" SUDO_EXTRA_ENVIRONMENT_VARIABLES[i]="$variable=${!variable}"
i=$((i + 1))
fi fi
done done
# Required by the darwin installer
export SUDO_KEPT_ENVIRONMENT_VARIABLES
} }
setup_sudo_extra_environment_variables setup_sudo_extra_environment_variables
@ -387,7 +386,7 @@ _sudo() {
if is_root; then if is_root; then
env "$@" env "$@"
else else
sudo --preserve-env="$SUDO_KEPT_ENVIRONMENT_VARIABLES" "$@" sudo "${SUDO_EXTRA_ENVIRONMENT_VARIABLES[@]}" "$@"
fi fi
} }