diff options
| author | Todd Naugle <toddn@glw.com> | 2012-07-20 17:06:46 +0000 |
|---|---|---|
| committer | Todd Naugle <toddn@glw.com> | 2012-07-20 17:06:46 +0000 |
| commit | 3c121f1ce2fde76fa22bcd3e7bd6fe48cf8bab29 (patch) | |
| tree | 4a28c2720267e90f865da1ba4e61fb79032d6956 | |
| parent | 5415d4d1003cf67ea9fdef952835bcf0c0a27c45 (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/2.0-ongoing@13063 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | tools/linux_packaging/ardour.sh.in | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/tools/linux_packaging/ardour.sh.in b/tools/linux_packaging/ardour.sh.in index 1e1b36a4b0..2d45607a9a 100644 --- a/tools/linux_packaging/ardour.sh.in +++ b/tools/linux_packaging/ardour.sh.in @@ -1,13 +1,18 @@ #!/bin/sh +# 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 @@ -45,11 +50,20 @@ 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 + +# 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-%VER% "$@" + exec gdb $INSTALL_DIR/bin/ardour-%VER% else - exec $INSTALL_DIR/bin/ardour-%VER% "$@" + exec $INSTALL_DIR/bin/ardour-%VER% $ARGS fi |