diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2018-10-17T13·16+0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-17T13·16+0200 |
commit | 7a9ac91a43e1e05e9df9d1b9b4a2cf322d62bb1c (patch) | |
tree | e014f5b94127bd917ccaf9c8715fac7b65e38745 /scripts/install.in | |
parent | bd78544f66a001f00623d3d0e9d50b019ada6a9a (diff) | |
parent | ea41838ae049817fd996ead14e040d922bb7c067 (diff) |
Merge pull request #2481 from graham-at-target/patch-1
install script: remove unportable command check, fixup errant escape
Diffstat (limited to 'scripts/install.in')
-rw-r--r-- | scripts/install.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/install.in b/scripts/install.in index 26ab85ba0992..7bff7b216d9e 100644 --- a/scripts/install.in +++ b/scripts/install.in @@ -11,14 +11,14 @@ oops() { } tmpDir="$(mktemp -d -t nix-binary-tarball-unpack.XXXXXXXXXX || \ - oops "Can\'t create temporary directory for downloading the Nix binary tarball")" + oops "Can't create temporary directory for downloading the Nix binary tarball")" cleanup() { rm -rf "$tmpDir" } trap cleanup EXIT INT QUIT TERM require_util() { - type "$1" > /dev/null 2>&1 || which "$1" > /dev/null 2>&1 || + type "$1" > /dev/null 2>&1 || command -v "$1" > /dev/null 2>&1 || oops "you do not have '$1' installed, which I need to $2" } |