Really fix /etc/grml/lsb-functions :)

diff --git a/.hgtags b/.hgtags
index a322811..eae0161 100644 (file)
--- a/.hgtags
+++ b/.hgtags
@@ -78,3 +78,5 @@ d42e087e9f9cbe96f1d62b9284d4a406bad328da 0.3.20
 6c6c7ebf37b063f2006783804134dbbe6cfc0997 0.3.21
 cc47627d16b529f88a9b365969a9f14d934cd91f 0.3.22
 9cf51e9d5c488a33870e8187a22bd7bf506d6fe9 0.3.23
+b821a25857a814e92805c054cfbb7161749b816c 0.3.24
+b3dd3602104adcf23482f1652c8bba79cbdfbedf 0.3.25

diff --git a/debian/changelog b/debian/changelog
index a2943d1..282594b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,29 @@
+grml-etc-core (0.3.26) unstable; urgency=low
+
+  [ Frank Terbeck ]
+  * /etc/grml/lsb-functions: fix empty $COLS when running inside
+    chroot
+
+ -- Michael Prokop <mika@grml.org>  Sat, 15 Sep 2007 13:49:29 +0200
+
+grml-etc-core (0.3.25) unstable; urgency=low
+
+  * /etc/zsh/zshrc: unalias utf2iso and iso2utf only it it's set.
+
+ -- Michael Prokop <mika@grml.org>  Sat, 15 Sep 2007 10:44:11 +0200
+
 grml-etc-core (0.3.24) unstable; urgency=low
 
-  [Frank Terbeck]
+  [ Frank Terbeck ]
   * try to make 'lsb-functions' parsable by (d)ash
 
- -- Michael Prokop <mika@grml.org>  Thu, 13 Sep 2007 01:20:11 +0200
+  [ Michael Prokop ]
+  * /etc/zsh/zshrc: convert utf2iso and iso2utf into functions,
+    Use 'command grep' (thanks to z3ttacht) and fix a small bug
+    in iso2utf.
+  * Pre-Depend on zsh [Testing: issue287]
+
+ -- Michael Prokop <mika@grml.org>  Sat, 15 Sep 2007 10:24:36 +0200
 
 grml-etc-core (0.3.23) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index aacbe0c..6aebe99 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,8 @@ XS-Vcs-Browser: http://hg.grml.org/grml-etc-core/
 Package: grml-etc-core
 Architecture: all
 Conflicts: grml-etc (<< 0.8-11), grml-autoconfig (<< 0.5-7), grml-scripts (<< 0.8-27)
-Depends: editor | vim | nvi, zsh
+Depends: editor | vim | nvi
+Pre-Depends: zsh
 Description: core ecetera files for the grml system
  This package includes some /etc files for the
  grml system. Whereas the main grml-etc package is

diff --git a/debian/preinst b/debian/preinst
index 64f5164..06a7917 100755 (executable)
--- a/debian/preinst
+++ b/debian/preinst
@@ -4,7 +4,7 @@
 # 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.
-# Latest change: Mit Mär 21 19:03:31 CET 2007 [mika]
+# Latest change: Sam Sep 15 10:36:46 CEST 2007 [mika]
 ################################################################################
 
 set -e
@@ -28,13 +28,14 @@ case "$1" in
         # we don't lose any files...
         for file in /etc/zsh/zlogin /etc/zsh/zprofile /etc/zsh/zshenv /etc/zsh/zshrc \
                     /etc/zsh/zlogout /etc/vim/vimrc; do
-               [ -e "$file".original ] || cp -f "$file" "${file}.tmp.$$" || /bin/true
+               [ -e "$file".original ] || cp -f "$file" "${file}.tmp.$TMP" 2>/dev/null || /bin/true
+              # [ -e "$file".dpkg-new ] && cp -f "$file".dpkg-new "${file}.tmp.$TMP"
                backup_conffile $file && \
                [ -f "$file" ] && rm $file && \
                dpkg-divert --quiet --add --rename --package grml-etc-core --divert "$file".original $file  && \
                [ -f "$file".dpkg-bak ]      && mv -f "$file".dpkg-bak "$file"
                [ -f "$file".grml-etc-core ] && mv -f "$file".grml-etc-core "$file"
-              [ -e "${file}.tmp.$$" ]      && mv -f "${file}.tmp.$$" "$file.original"
+              [ -e "${file}.tmp.$TMP" ]      && mv -f "${file}.tmp.$TMP" "$file.original"
 
                # trying to overwrite `/etc/skel/.zshrc', which is also in package zsh
                # [ -f /etc/skel/.zshrc ] && \

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index b38e25e..0f43289 100644 (file)
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -3,7 +3,7 @@
 # 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.
-# Latest change: Sam Jul 07 10:56:20 CEST 2007 [mika]
+# Latest change: Sam Sep 15 10:24:10 CEST 2007 [mika]
 ################################################################################
 # This file is sourced only for interactive shells. It
 # should contain commands to set up aliases, functions,
@@ -165,7 +165,7 @@
   #f1# Checks whether or not you're running grml-small
     isgrmlsmall() {
     [[ ${${${(f)"$(</etc/grml_version)"}%% *}##*-} == 'small' ]] && return 0 ; return 1
-  }
+    }
   else
     isgrmlsmall() { return 1 }
   fi
@@ -809,16 +809,23 @@ ${BLUE}%n${NO_COLOUR}@%m %40<...<%B%~%b%<< %# "
   alias term2iso="echo 'Setting terminal to iso mode' ; print -n '\e%@'"
   alias term2utf="echo 'Setting terminal to utf-8 mode'; print -n '\e%G'"
 
-  alias utf2iso='if isutfenv ; then
-   for ENV in `env | grep UTF` ; do
-       eval export "$(echo $ENV | sed 's/UTF-8/iso885915/')"
-   done
-   fi'
-  alias iso2utf='if isutfenv ; then
-   for ENV in `env | grep '\.iso'` ; do
-       eval export "$(echo $ENV | sed 's/iso.*/UTF-8/')"
-   done
-   fi'
+  type utf2iso &>/dev/null && unalias utf2iso # make sure it is not assigned yet
+  utf2iso() {
+    if isutfenv ; then
+       for ENV in $(env | command grep -i '.utf') ; do
+           eval export "$(echo $ENV | sed 's/UTF-8/iso885915/ ; s/utf8/iso885915/')"
+       done
+     fi
+  }
+
+  type iso2utf &>/dev/null && unalias iso2utf # make sure it is not assigned yet
+  iso2utf() {
+   if ! isutfenv ; then
+      for ENV in $(env | command grep -i '\.iso') ; do
+          eval export "$(echo $ENV | sed 's/iso.*/UTF-8/ ; s/ISO.*/UTF-8/')"
+      done
+   fi
+ }
 
 # set up software synthesizer via speakup
   alias swspeak='