3
0
Fork 0
forked from mirrors/nixpkgs

makeWrapper: use consistent style

All the other plain variable references (before e1d46c0c4) are without
braces.
This commit is contained in:
Tuomas Tynkkynen 2017-08-11 13:26:51 +03:00
parent 1a0f8263fe
commit 58834f727f

View file

@ -3,8 +3,8 @@
# assertExecutable FILE
assertExecutable() {
local file="$1"
[[ -f "${file}" && -x "${file}" ]] || \
die "Cannot wrap ${file} because it is not an executable file"
[[ -f "$file" && -x "$file" ]] || \
die "Cannot wrap '$file' because it is not an executable file"
}
# construct an executable file that wraps the actual executable
@ -33,7 +33,7 @@ makeWrapper() {
local params varName value command separator n fileNames
local argv0 flagsBefore flags
assertExecutable "${original}"
assertExecutable "$original"
mkdir -p "$(dirname "$wrapper")"
@ -131,7 +131,7 @@ wrapProgram() {
local prog="$1"
local hidden
assertExecutable "${prog}"
assertExecutable "$prog"
hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped
while [ -e "$hidden" ]; do