From 58834f727fab8c1c7d47c6f59b99ac42780b690a Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 11 Aug 2017 13:26:51 +0300 Subject: [PATCH] makeWrapper: use consistent style All the other plain variable references (before e1d46c0c4) are without braces. --- pkgs/build-support/setup-hooks/make-wrapper.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh index cde28fbbcaf..f9d435df655 100644 --- a/pkgs/build-support/setup-hooks/make-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-wrapper.sh @@ -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