diff options
| author | Graham Christensen <graham@grahamc.com> | 2018-05-30T13·11-0400 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2018-05-30T13·15-0400 |
| commit | d459d3307c7b1b10f6489ed048fff192e7834928 (patch) | |
| tree | 3920a3dc4f1a0408fce22cd8b9e9a1a20197969a | |
| parent | f9940f47b36df396799d90c3ff691a1ef0c45c35 (diff) | |
nix-daemon.sh profile script: operate under `set -u`
If the profile is sourced inside a script with `set -u`, the check for __ETC_PROFILE_NIX_SOURCED and NIX_SSL_CERT_FILE would raise an error. A simple guard around this check allows the script to operate under standard environments (where it is fairly reasonable to assume USER and HOME are set.)
| -rw-r--r-- | scripts/nix-profile-daemon.sh.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/nix-profile-daemon.sh.in b/scripts/nix-profile-daemon.sh.in index 52070e36a1e2..1be9a0755d85 100644 --- a/scripts/nix-profile-daemon.sh.in +++ b/scripts/nix-profile-daemon.sh.in @@ -1,5 +1,5 @@ # Only execute this file once per shell. -if [ -n "$__ETC_PROFILE_NIX_SOURCED" ]; then return; fi +if [ -n "${__ETC_PROFILE_NIX_SOURCED:-}" ]; then return; fi __ETC_PROFILE_NIX_SOURCED=1 # Set up secure multi-user builds: non-root users build through the @@ -51,7 +51,7 @@ fi # Set $NIX_SSL_CERT_FILE so that Nixpkgs applications like curl work. -if [ ! -z "$NIX_SSL_CERT_FILE" ]; then +if [ ! -z "${NIX_SSL_CERT_FILE:-}" ]; then : # Allow users to override the NIX_SSL_CERT_FILE elif [ -e /etc/ssl/certs/ca-certificates.crt ]; then # NixOS, Ubuntu, Debian, Gentoo, Arch export NIX_SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt |