public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

makeWrapper: use consistent style

Browse Source 
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
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/build-support/setup-hooks/make-wrapper.sh
View File

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