X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=usr_bin%2Fcaps-ctrl;h=824ddd1a1fde0968a6c3d28c9e247848af269120;hb=5b0c6b200fe0a76b7a78c984733defdb3120ea6a;hp=b4bd3cc3de5a3c1a05ae1ed34ce67eb6a1652693;hpb=ec7a53a2517d85db80eaba4e0c77210391cbd12c;p=grml-scripts.git

diff --git a/usr_bin/caps-ctrl b/usr_bin/caps-ctrl
index b4bd3cc..824ddd1 100755
--- a/usr_bin/caps-ctrl
+++ b/usr_bin/caps-ctrl
@@ -7,15 +7,15 @@
 ################################################################################
 
 if [[ -f /etc/grml/script-functions ]] ; then
-        source /etc/grml/script-functions \
-        && check4progs xmodmap loadkeys dumpkeys
+	source /etc/grml/script-functions && \
+   	check4progs xmodmap loadkeys dumpkeys || exit 1
 fi
 if [[ -f /etc/grml/lsb-functions ]] ; then
-        source /etc/grml/lsb-functions
+	source /etc/grml/lsb-functions
 else
-         einfo() { echo "$*" ; }
-         eerror() { echo "$*" ; }
-         eend() { echo  "$*" ; }
+	einfo() { echo  "$*" ; }
+	eerror() { echo "$*" ; }
+	eend() { echo "$*" ; }
 fi
 
 emulate zsh
@@ -33,7 +33,7 @@ if [[ -z $DISPLAY  ]] ; then # test if X is not running when calling us
            loadkeys <<- EOT
            keycode 58 = $(repeat 15 echo -n 'Control ')
            keycode 29 = $(repeat 7 echo -n 'Caps_Lock ')
-                EOT
+		EOT
            eend $?
 
         ) || (
@@ -42,7 +42,7 @@ if [[ -z $DISPLAY  ]] ; then # test if X is not running when calling us
            loadkeys <<- EOT
            keycode 58 = $(repeat 15 echo -n 'Caps_Lock ')
            keycode 29 = $(repeat 7 echo -n 'Control ')
-                EOT
+		EOT
            eend $?
          )
 
@@ -54,7 +54,7 @@ else     # running under X
         xmodmap -pke | grep 'Caps_Lock' > /dev/null || (
         xmodmap - <<- EOT
         keycode 66 = Caps_Lock
-                EOT
+		EOT
         )
 
         xmodmap - <<- EOT
@@ -70,7 +70,7 @@ else     # running under X
         add lock = Caps_Lock
         add Control = Control_L
         !add Control = Control_R
-                EOT
+		EOT
         eend $?
         )
 fi # end of test if X or console is used