summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authornickolas360 <nickolas360@users.noreply.github.com>2017-06-23 14:03:59 -0700
committerRobin Gareus <robin@gareus.org>2017-07-18 19:11:18 +0200
commit8bc7154130674b56b568f4cca11b4a2ba22dbf40 (patch)
tree695dd53d41011f3948f93fde985fb3ae3b9a3bc4 /tools
parent81eb619dc2df70609d1ac3b6a87a52746ab27d23 (diff)
Fix LD_LIBRARY_PATH in GNU/Linux startup script
Currently, the startup script for GNU/Linux adds the current working directory to LD_LIBRARY_PATH if LD_LIBRARY_PATH is not empty or unset. For example, if LD_LIBRARY_PATH is set to "/lib" when the current script is run, it will be set to "<install-dir>/lib::/lib", which includes the current working directory as one of the paths. This commit removes the extra colon added to LD_LIBRARY_PATH (without changing the script's behavior of setting LD_LIBRARY_PATH to an empty string when it is unset).
Diffstat (limited to 'tools')
-rw-r--r--tools/linux_packaging/ardour.sh.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/linux_packaging/ardour.sh.in b/tools/linux_packaging/ardour.sh.in
index a6bd679b94..1a2e1206be 100644
--- a/tools/linux_packaging/ardour.sh.in
+++ b/tools/linux_packaging/ardour.sh.in
@@ -17,7 +17,7 @@ checkdebug "$@"
# LD_LIBRARY_PATH needs to be set here so that epa can swap between the original and the bundled version
# (the original one will be stored in PREBUNDLE_ENV)
-export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
export PREBUNDLE_ENV="$(env)"
BIN_DIR=$(dirname $(readlink -f $0))