From 28919e5bfa23111e099f91b7edcc5828a9d451b3 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Sat, 16 Apr 2016 00:51:41 +0100
Subject: [PATCH 1/2] wrapPythonPrograms: preserve quoted strings from
makeWrapperArgs
Currently, if a user tries to to set a variable that contains
spaces, it will be broken up before being passed to wrapProgram.
This commit resolves that by converting makeWrapperArgs to an
array that preserves any quoted elements using bash's parser.
---
pkgs/development/python-modules/generic/wrap.sh | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh
index fa6a4d0102f3..5d8e2e986735 100644
--- a/pkgs/development/python-modules/generic/wrap.sh
+++ b/pkgs/development/python-modules/generic/wrap.sh
@@ -44,16 +44,15 @@ wrapPythonProgramsIn() {
# wrapProgram creates the executable shell script described
# above. The script will set PYTHONPATH and PATH variables.!
# (see pkgs/build-support/setup-hooks/make-wrapper.sh)
- local wrap_args="$f \
- --prefix PYTHONPATH ':' $program_PYTHONPATH \
- --prefix PATH ':' $program_PATH:$dir/bin"
+ local -a wrap_args=("$f"
+ --prefix PYTHONPATH ':' "$program_PYTHONPATH"
+ --prefix PATH ':' "$program_PATH:$dir/bin")
# Add any additional arguments provided by makeWrapperArgs
# argument to buildPythonPackage.
- for arg in $makeWrapperArgs; do
- wrap_args="$wrap_args $arg"
- done
- wrapProgram $wrap_args
+ local -a user_args="($makeWrapperArgs)"
+ local -a wrapProgramArgs=("${wrap_args[@]}" "${user_args[@]}")
+ wrapProgram "${wrapProgramArgs[@]}"
fi
fi
done
From d534e38d58fb8c91236db5aff6dd2a1b8566bfa2 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Sat, 16 Apr 2016 01:10:55 +0100
Subject: [PATCH 2/2] makeWrapper: allow special characters in variable
contents
---
pkgs/build-support/setup-hooks/make-wrapper.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh
index 7d0f88abb855..d3db0b64bd53 100644
--- a/pkgs/build-support/setup-hooks/make-wrapper.sh
+++ b/pkgs/build-support/setup-hooks/make-wrapper.sh
@@ -16,7 +16,7 @@ makeWrapper() {
varName=${params[$((n + 1))]}
value=${params[$((n + 2))]}
n=$((n + 2))
- echo "export $varName=$value" >> $wrapper
+ echo "export $varName='$value'" >> $wrapper
fi
if test "$p" = "--unset"; then