Skip to content

Commit

Permalink
installer: fix unused variable
Browse files Browse the repository at this point in the history
(cherry picked from commit 3d3c219)
Signed-off-by: Domen Kožar <[email protected]>
  • Loading branch information
domenkozar committed May 26, 2020
1 parent f117c54 commit e15dc67
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions scripts/install-multi-user.sh
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@ create_directories() {
}

place_channel_configuration() {
if [ -z "$NIX_INSTALLER_NO_CHANNEL_ADD" ]; then
if [ -z "${NIX_INSTALLER_NO_CHANNEL_ADD:-}" ]; then
echo "https://nixos.org/channels/nixpkgs-unstable nixpkgs" > "$SCRATCH/.nix-channels"
_sudo "to set up the default system channel (part 1)" \
install -m 0664 "$SCRATCH/.nix-channels" "$ROOT_HOME/.nix-channels"
Expand Down Expand Up @@ -731,7 +731,7 @@ setup_default_profile() {
export NIX_SSL_CERT_FILE=/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt
fi

if [ -z "$NIX_INSTALLER_NO_CHANNEL_ADD" ]; then
if [ -z "${NIX_INSTALLER_NO_CHANNEL_ADD:-}" ]; then
# Have to explicitly pass NIX_SSL_CERT_FILE as part of the sudo call,
# otherwise it will be lost in environments where sudo doesn't pass
# all the environment variables by default.
Expand Down

0 comments on commit e15dc67

Please sign in to comment.