diff options
| author | Artturin <Artturin@artturin.com> | 2023-07-28 17:30:50 +0300 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2023-09-02 03:25:36 +0300 |
| commit | 1db1e3c46750e53fa3649bcd2893a248fe6de292 (patch) | |
| tree | 552e02c8a2cf74f46e7671126adbb2dd4bb20de3 /pkgs/build-support/setup-hooks | |
| parent | 9816ca55c2fd0619542f420f8e6cfaa8ebaf4ea8 (diff) | |
stdenv: Fix possible issues discovered with
``` set -o errexit -o nounset -o pipefail shopt -s inherit_errexit ``` in `stdenv/default-builder.sh`
Diffstat (limited to 'pkgs/build-support/setup-hooks')
| -rw-r--r-- | pkgs/build-support/setup-hooks/multiple-outputs.sh | 4 | ||||
| -rw-r--r-- | pkgs/build-support/setup-hooks/patch-shebangs.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh index 8a62c57dbd071..45096d833b427 100644 --- a/pkgs/build-support/setup-hooks/multiple-outputs.sh +++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh @@ -69,8 +69,8 @@ _multioutConfig() { # try to detect share/doc/${shareDocName} # Note: sadly, $configureScript detection comes later in configurePhase, # and reordering would cause more trouble than worth. - if [ -z "$shareDocName" ]; then - local confScript="$configureScript" + if [ -z "${shareDocName:-}" ]; then + local confScript="${configureScript:-}" if [ -z "$confScript" ] && [ -x ./configure ]; then confScript=./configure fi diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh index 9a48440debec3..1424238f17563 100644 --- a/pkgs/build-support/setup-hooks/patch-shebangs.sh +++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh @@ -53,7 +53,7 @@ patchShebangs() { read -r oldInterpreterLine < "$f" read -r oldPath arg0 args <<< "${oldInterpreterLine:2}" - if [[ -z "$pathName" ]]; then + if [[ -z "${pathName:-}" ]]; then if [[ -n $strictDeps && $f == "$NIX_STORE"* ]]; then pathName=HOST_PATH else |