X-Git-Url: http://git.grml.org/?p=grml-scripts.git;a=blobdiff_plain;f=usr_share%2Frun-welcome;h=de46a1f8b16bdbf3839c1fc0761a1aef7904bed7;hp=f574b3dce96b2f8a61694e7835179d16e47813cc;hb=HEAD;hpb=cc0570b11f755daea4c1b15161313970f3c1476d

diff --git a/usr_share/run-welcome b/usr_share/run-welcome
index f574b3d..d8d694a 100755
--- a/usr_share/run-welcome
+++ b/usr_share/run-welcome
@@ -6,27 +6,16 @@
 # License:       This file is licensed under the GPL v2.
 ################################################################################
 
+# shellcheck disable=SC1091
 . /etc/grml/sh-lib
 
+export SHELL=/bin/zsh
+
 [ -r /etc/grml_version ] && GRMLVERSION=$(cat /etc/grml_version) || GRMLVERSION='(no version information available)'
 PATH=$HOME/bin:/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/usr/games:/home/grml/bin
 CMDLINE=$(cat /proc/cmdline)
 [ -n "$distri" ] || distri="grml"
 
-# Activate unicode console if running within utf8 environment
-# Dirty hack to fix unicode issue on amd64...
-# unicode_start during bootprocess just does not work reliable :(
-NUM_CONSOLES=12
-if [ -r /etc/default/locale ] ; then
-   if grep -q "LANG=.*UTF" /etc/default/locale ; then
-       for vc in `seq 1 ${NUM_CONSOLES}` ; do
-           echo -n -e '\033%G' > /dev/tty${vc}
-       done
-       kbd_mode -u
-       dumpkeys | loadkeys --unicode > /dev/null
-   fi
-fi
-
 # welcome beep
 case "$CMDLINE" in
   *\ nobeep*)
@@ -40,7 +29,7 @@ case "$CMDLINE" in
    # allow customized startup via bootoption startup:
    *startup=*)
        script="$(getBootParam startup)"
-       if [ -x $(which $script) ] ; then
+       if [ -x "$(command -v "$script")" ] ; then
           $script
        fi
        ;;
@@ -50,7 +39,7 @@ case "$CMDLINE" in
       ;;
    *) # by default run grml-quickconfig, but only if running as root
       if [ "$(id -u)" = "0" ] ; then
-         which grml-quickconfig &>/dev/null && grml-quickconfig
+         command -v grml-quickconfig &>/dev/null && grml-quickconfig
       fi
 esac
 
@@ -95,6 +84,6 @@ Happy hacking!               http://grml.org/
 "
 fi
 
-exec /bin/zsh -l
+exec "$SHELL" -l
 
 ## END OF FILE #################################################################