diff options
| author | happysalada <raphael@megzari.com> | 2021-08-19 23:23:58 +0900 |
|---|---|---|
| committer | Raphael Megzari <raphael@megzari.com> | 2021-08-30 10:27:45 +0900 |
| commit | e32bf6f4f2df1bbe690c5eda194c611407b21b06 (patch) | |
| tree | cc3608c6e84973ed34518ae69bb1cc587e0b5ffc /pkgs/stdenv | |
| parent | 5b86e637d72adc1838735b85237553c354bd2dda (diff) | |
| download | nixpkgs-e32bf6f4f2df1bbe690c5eda194c611407b21b06.tar nixpkgs-e32bf6f4f2df1bbe690c5eda194c611407b21b06.tar.gz nixpkgs-e32bf6f4f2df1bbe690c5eda194c611407b21b06.tar.bz2 nixpkgs-e32bf6f4f2df1bbe690c5eda194c611407b21b06.tar.lz nixpkgs-e32bf6f4f2df1bbe690c5eda194c611407b21b06.tar.xz nixpkgs-e32bf6f4f2df1bbe690c5eda194c611407b21b06.tar.zst nixpkgs-e32bf6f4f2df1bbe690c5eda194c611407b21b06.zip | |
stdenv setup.sh: remove combined [ in favor of [[
[ ... ] && [ ...] -> [[ ... && ... ]]
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 6042fa9d032..e52ea8bdd66 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1,7 +1,7 @@ set -eu set -o pipefail -if [ -n "${BASH_VERSINFO-}" ] && [ "${BASH_VERSINFO-}" -lt 4 ]; then +if [[ -n "${BASH_VERSINFO-}" && "${BASH_VERSINFO-}" -lt 4 ]]; then echo "Detected Bash version that isn't supported by Nixpkgs (${BASH_VERSION})" echo "Please install Bash 4 or greater to continue." exit 1 @@ -675,11 +675,11 @@ export NIX_BUILD_CORES # Prevent SSL libraries from using certificates in /etc/ssl, unless set explicitly. # Leave it in impure shells for convenience. -if [ -z "${NIX_SSL_CERT_FILE:-}" ] && [ "${IN_NIX_SHELL:-}" != "impure" ]; then +if [[ -z "${NIX_SSL_CERT_FILE:-}" && "${IN_NIX_SHELL:-}" != "impure" ]]; then export NIX_SSL_CERT_FILE=/no-cert-file.crt fi # Another variant left for compatibility. -if [ -z "${SSL_CERT_FILE:-}" ] && [ "${IN_NIX_SHELL:-}" != "impure" ]; then +if [[ -z "${SSL_CERT_FILE:-}" && "${IN_NIX_SHELL:-}" != "impure" ]]; then export SSL_CERT_FILE=/no-cert-file.crt fi |