puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

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

Browse source 
install script: remove unportable command check, fixup errant escape
This commit is contained in:
Eelco Dolstra 2018-10-17 15:16:04 +02:00 committed by GitHub
parent bd78544f66 ea41838ae0
commit 7a9ac91a43
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/install.in
View file

@ -11,14 +11,14 @@ oops() {
} }
tmpDir="$(mktemp -d -t nix-binary-tarball-unpack.XXXXXXXXXX || \ 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() { cleanup() {
rm -rf "$tmpDir" rm -rf "$tmpDir"
} }
trap cleanup EXIT INT QUIT TERM trap cleanup EXIT INT QUIT TERM
require_util() { 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" oops "you do not have '$1' installed, which I need to $2"
} }