diff options
Diffstat (limited to 'Master/tlpkg/installer/install-tl.sh')
| -rwxr-xr-x | Master/tlpkg/installer/install-tl.sh | 44 |
1 files changed, 5 insertions, 39 deletions
diff --git a/Master/tlpkg/installer/install-tl.sh b/Master/tlpkg/installer/install-tl.sh index 47bb03304dd..5dc1b2da7bd 100755 --- a/Master/tlpkg/installer/install-tl.sh +++ b/Master/tlpkg/installer/install-tl.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # default: tcl gui or not if test `uname -s` = Darwin; then @@ -9,13 +9,10 @@ fi # are there reasons not to use the tcl gui? notcl=no -args='' - unset wait_for_gui -unset wait_for_lang unset gui_set -# We need "$@ syntax because some paramters may contain spaces. +# We need "$@" syntax because some parameters may contain spaces. # In order to make use of this syntax we must pass along ALL parameters. for p in "$@"; do # TODO: sanitize $p; abort if necessary @@ -23,26 +20,22 @@ for p in "$@"; do -tcl | --tcl) if test $gui_set; then echo Gui set more than once; exit 1; fi gui_set=1 - if test $wait_for_lang; then echo Language code expected; exit 1; fi unset wait_for_gui tcl=yes ;; -print-platform | --print-platform | -version | --version) - if test $wait_for_lang; then echo Language code expected; exit 1; fi unset wait_for_gui notcl=yes ;; -gui | --gui) if test $gui_set; then echo Gui set more than once; exit 1; fi gui_set=1 - if test $wait_for_lang; then echo Language code expected; exit 1; fi tcl=yes wait_for_gui=1 ;; --gui=* | -gui=*) if test $gui_set; then echo Gui set more than once; exit 1; fi gui_set=1 - if test $wait_for_lang; then echo Language code expected; exit 1; fi if test $p = -gui=text -o $p = --gui=text; then tcl=no else @@ -51,27 +44,9 @@ for p in "$@"; do unset wait_for_gui ;; -no-gui | --no-gui) - if test $wait_for_lang; then echo Language code expected; exit 1; fi unset wait_for_gui notcl=yes ;; - -lang | --lang) - if test $wait_for_lang; then echo Language code expected; exit 1; fi - unset wait_for_gui - wait_for_lang=1 - ;; - -lang=*) - if test $wait_for_lang; then echo Language code expected; exit 1; fi - unset wait_for_gui - LANG=$p - LANG=${LANG#-lang=} - ;; - --lang=*) - if test $wait_for_lang; then echo Language code expected; exit 1; fi - unset wait_for_gui - LANG=$p - LANG=${LANG#--lang=} - ;; *) if test $wait_for_gui; then if test $p = text; then @@ -81,10 +56,6 @@ for p in "$@"; do fi unset wait_for_gui fi - if test $wait_for_lang; then - LANG=$p - unset wait_for_lang - fi ;; esac done @@ -92,21 +63,16 @@ if test $notcl = yes; then tcl=no fi -export LANG -LC_MESSAGES=$LANG -export LC_MESSAGES -unset LC_ALL - # silence perl locale warnings PERL_BADLANG=0 export PERL_BADLANG # We can safely pass all original parameters to perl: # In install-tl[.pl], from_ext_gui will overrule the gui parameter. -# The lang parameter will not come into play in either perl or tcl. +# The lang parameter will be handled by tcl and not come into play in perl if test "$tcl" = "yes"; then - exec wish `dirname $0`/install-tl-gui.tcl -- "$@" + wish `dirname $0`/install-tl-gui.tcl -- "$@" & else - exec perl `dirname $0`/../../install-tl "$@" + perl `dirname $0`/../../install-tl "$@" fi |