Merge pull request #2481 from graham-at-target/patch-1

install script: remove unportable command check, fixup errant escape
NixOS · Oct 17, 2018 · 7a9ac91 · 7a9ac91
2 parents bd78544 + ea41838
commit 7a9ac91
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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"
 }