diff options
author | Todd Naugle <toddn@glw.com> | 2012-07-20 17:05:43 +0000 |
---|---|---|
committer | Todd Naugle <toddn@glw.com> | 2012-07-20 17:05:43 +0000 |
commit | 0f79645be79584e6670c1b4e053dcdb8083cae0e (patch) | |
tree | 56580ecbcee2599ebef9cc83bece40a4f2229957 /tools/linux_packaging | |
parent | 4f77bf201ec36d04305421202ba1c971862c579a (diff) |
Correctly allow startup options to be passed to the main program when bundled. Launching a bundle in gdb now uses --debug instead of -d. This removes the confilt with the main application -d option. Also added i18n fix that forces translations off when translations are disabled
git-svn-id: svn://localhost/ardour2/branches/3.0@13062 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'tools/linux_packaging')
-rw-r--r-- | tools/linux_packaging/ardour.sh.in | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/tools/linux_packaging/ardour.sh.in b/tools/linux_packaging/ardour.sh.in index 83f69bb2b6..3c8e77fb7f 100644 --- a/tools/linux_packaging/ardour.sh.in +++ b/tools/linux_packaging/ardour.sh.in @@ -2,14 +2,17 @@ # This is Linux-specific startup script for a bundled version of Ardour +ARGS="" + while [ $# -gt 0 ] ; do - echo "arg = $1" case $1 in - -d) + --debug) DEBUG="T"; shift ;; - *) break;; + *) + ARGS=$ARGS$1" "; + shift; ;; esac done @@ -43,16 +46,25 @@ export GTK_MODULES="" export LD_LIBRARY_PATH=$INSTALL_DIR/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} # create install-location-dependent config files for Pango and GDK image loaders -# We have to do this every time because its possible that LIB_DIR has changed +# We have to do this every time because its possible that BIN_DIR has changed 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 + +# Hack to fix i18n issue where the grid button gets translated even when translations are disabled. + +if [ ! -e $USER_ARDOUR_DIR/.love_is_the_language_of_audio ]; then + # Translations are disabled. Force english + export LANG=C +fi + + if [ "T" = "$DEBUG" ]; then export ARDOUR_INSIDE_GDB=1 - exec gdb $INSTALL_DIR/bin/ardour-3.0 "$@" + exec gdb $INSTALL_DIR/bin/ardour-3.0 else - exec $INSTALL_DIR/bin/ardour-3.0 "$@" + exec $INSTALL_DIR/bin/ardour-3.0 $ARGS fi |