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

diff --git a/usr_share/run-welcome b/usr_share/run-welcome
index e409835..d8d694a 100755
--- a/usr_share/run-welcome
+++ b/usr_share/run-welcome
@@ -1,32 +1,21 @@
 #!/bin/bash
 # Filename:      run-welcome
-# Purpose:       customized zsh login welcome screen for use at grml
+# Purpose:       customized zsh login welcome screen for use at Grml
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # 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
 
@@ -67,8 +56,7 @@ else # ... or finally fall back to grml's default
      echo
      echo 'NOTICE: This is a release candidate version!'
      echo 'Please notice that this is not yet a stable release.'
-     echo 'See http://wiki.grml.org/doku.php?id=release_candidate for known issues.'
-     echo 'Please report any bugs you notice: bugs@grml.org'
+     echo 'Please report any bugs you notice: http://grml.org/bugs/'
      echo
   fi
 
@@ -78,7 +66,7 @@ else # ... or finally fall back to grml's default
      echo 'NOTICE: This is a daily snapshot version!'
      echo 'Please notice that this is not yet a stable release.'
      echo 'See http://daily.grml.org/ for more details.'
-     echo 'Please report any bugs you notice: daily@grml.org'
+     echo 'Please report any bugs you notice: http://grml.org/bugs/'
      echo
   fi
 
@@ -96,6 +84,6 @@ Happy hacking!               http://grml.org/
 "
 fi
 
-exec /bin/zsh -l
+exec "$SHELL" -l
 
 ## END OF FILE #################################################################