From d2a70266573df319c65a0478222be0c2c9fd5c19 Mon Sep 17 00:00:00 2001 From: Todd Naugle Date: Thu, 6 Jan 2011 19:11:14 +0000 Subject: [PATCH] Store our enviroment off before we change it. EPA will used the stored version when making calls to start jack. Also allow the build script to set the executable version in the launch script git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@8468 d708f5d6-7413-0410-9779-e7cbd77b26cf --- tools/linux_packaging/ardour.sh.in | 5 ++++- tools/linux_packaging/build | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/linux_packaging/ardour.sh.in b/tools/linux_packaging/ardour.sh.in index 97b66cbf8d..7354038f75 100644 --- a/tools/linux_packaging/ardour.sh.in +++ b/tools/linux_packaging/ardour.sh.in @@ -1,5 +1,8 @@ #!/bin/sh +export LD_LIBRARY_PATH="" #This needs to be set empty so that epa can swap between empty and the bundled version +export PREBUNDLE_ENV="$(env)" + BIN_DIR=$(dirname $(readlink -f $0)) INSTALL_DIR=$(dirname $BIN_DIR) LIB_DIR=$INSTALL_DIR/lib @@ -29,7 +32,7 @@ export LD_LIBRARY_PATH=$INSTALL_DIR/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} sed "s?@ROOTDIR@/modules?$LIB_DIR/modules?" < $ETC_DIR/pango.modules.in > $USER_ARDOUR_DIR/pango.modules sed "s?@ROOTDIR@/loaders?$LIB_DIR/loaders?" < $ETC_DIR/gdk-pixbuf.loaders.in > $USER_ARDOUR_DIR/gdk-pixbuf.loaders -exec $INSTALL_DIR/bin/ardour-2.8.11 "$@" +exec $INSTALL_DIR/bin/ardour-%VER% "$@" diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index 49bff76b5d..f37a0a32b8 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -202,7 +202,7 @@ echo export 'PATH=/usr/local/bin:/opt/bin:$PATH' >> $ENVIRONMENT # create startup helper script -sed -e "/^%ENV%/r $ENVIRONMENT" -e '/^%ENV%/d' < ardour.sh.in > $APPBIN/ardour2 +sed -e "/^%ENV%/r $ENVIRONMENT" -e '/^%ENV%/d' -e 's/%VER%/'"${release_version}"'/' < ardour.sh.in > $APPBIN/ardour2 rm $ENVIRONMENT && chmod 775 $APPBIN/ardour2 MAIN_EXECUTABLE=ardour-$release_version