Fix tabs inside caps-ctrl.

diff --git a/debian/changelog b/debian/changelog
index e5d2127..b24c66e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-scripts (1.3.1) unstable; urgency=low
+
+  [ Matthias Kopfermann ]
+  * Fix tabs inside caps-ctrl.
+
+ -- Michael Prokop <mika@grml.org>  Mon, 29 Mar 2010 08:59:44 +0200
+

 grml-scripts (1.3.0) unstable; urgency=low
 
   [ Matthias Kopfermann ]
 grml-scripts (1.3.0) unstable; urgency=low
 
   [ Matthias Kopfermann ]

diff --git a/usr_bin/caps-ctrl b/usr_bin/caps-ctrl
index b4bd3cc..824ddd1 100755 (executable)
--- a/usr_bin/caps-ctrl
+++ b/usr_bin/caps-ctrl
@@ -7,15 +7,15 @@
 ################################################################################
 
 if [[ -f /etc/grml/script-functions ]] ; then
 ################################################################################
 
 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
 fi
 if [[ -f /etc/grml/lsb-functions ]] ; then

-        source /etc/grml/lsb-functions
+       source /etc/grml/lsb-functions

 else
 else

-         einfo() { echo "$*" ; }
-         eerror() { echo "$*" ; }
-         eend() { echo  "$*" ; }
+       einfo() { echo  "$*" ; }
+       eerror() { echo "$*" ; }
+       eend() { echo "$*" ; }

 fi
 
 emulate zsh
 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 ')
            loadkeys <<- EOT
            keycode 58 = $(repeat 15 echo -n 'Control ')
            keycode 29 = $(repeat 7 echo -n 'Caps_Lock ')

-                EOT
+               EOT

            eend $?
 
         ) || (
            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 ')
            loadkeys <<- EOT
            keycode 58 = $(repeat 15 echo -n 'Caps_Lock ')
            keycode 29 = $(repeat 7 echo -n 'Control ')

-                EOT
+               EOT

            eend $?
          )
 
            eend $?
          )
 


@@ -54,7 +54,7 @@ else     # running under X
         xmodmap -pke | grep 'Caps_Lock' > /dev/null || (
         xmodmap - <<- EOT
         keycode 66 = Caps_Lock
         xmodmap -pke | grep 'Caps_Lock' > /dev/null || (
         xmodmap - <<- EOT
         keycode 66 = Caps_Lock

-                EOT
+               EOT

         )
 
         xmodmap - <<- EOT
         )
 
         xmodmap - <<- EOT


@@ -70,7 +70,7 @@ else     # running under X
         add lock = Caps_Lock
         add Control = Control_L
         !add Control = Control_R
         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
         eend $?
         )
 fi # end of test if X or console is used