X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=usr_share%2Frun-welcome;h=265301e4b2988b29dcc0ee1f547a36313ac9f416;hb=41dd2c5a3e4dff8789a7f6110f70b298f1cd7d2b;hp=90fd7be927c89a35fc307d5673f9dc3a80c8cd0c;hpb=c08b156abb0b2b1b1335cb1ada0c08758553238b;p=grml-scripts.git

diff --git a/usr_share/run-welcome b/usr_share/run-welcome
index 90fd7be..265301e 100755
--- a/usr_share/run-welcome
+++ b/usr_share/run-welcome
@@ -1,37 +1,33 @@
 #!/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
 
 [ -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/X11R6/bin:/usr/games:/home/grml/bin
+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*)
+    ;;
+  *)
+    (for f in 1000 2000 1500 1750; do beep -f $f -l 150; done) &
+    ;;
+esac
 
 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
        ;;
@@ -41,7 +37,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
 
@@ -58,8 +54,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
 
@@ -69,7 +64,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