Fix LD_LIBRARY_PATH in GNU/Linux startup script
authornickolas360 <nickolas360@users.noreply.github.com>
Fri, 23 Jun 2017 21:03:59 +0000 (14:03 -0700)
committerRobin Gareus <robin@gareus.org>
Tue, 18 Jul 2017 17:11:18 +0000 (19:11 +0200)
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).

tools/linux_packaging/ardour.sh.in

index a6bd679b94266656dd07a16fa4068395b8a71931..1a2e1206be789de533c15af555dd0d84759664ef 100644 (file)
@@ -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))