Cleanup indenting in preinst, postrm

diff --git a/debian/postrm b/debian/postrm
index 24990bd..72da544 100755 (executable)
--- a/debian/postrm
+++ b/debian/postrm
@@ -13,30 +13,30 @@ TO_UNDIVERT2=".zshrc"
 TO_UNDIVERT3="vimrc"
 
 undivert_gen() {
 TO_UNDIVERT3="vimrc"
 
 undivert_gen() {

-  if [ -f "$2/$1" -o "$2/$1".original ] ; then
-    DEXT=${3:-original}
-    dpkg-divert --remove --rename --package grml-etc-core \
-        --divert $2/$1.$DEXT $2/$1 #> /dev/null
-  fi
+    if [ -f "$2/$1" -o "$2/$1".original ] ; then
+        DEXT=${3:-original}
+        dpkg-divert --remove --rename --package grml-etc-core \
+            --divert $2/$1.$DEXT $2/$1 #> /dev/null
+    fi

 }
 
 case "$1" in
     purge)
         for cmd in $TO_UNDIVERT1; do
 }
 
 case "$1" in
     purge)
         for cmd in $TO_UNDIVERT1; do

-                undivert_gen $cmd /etc/zsh
+            undivert_gen $cmd /etc/zsh

         done
         for cmd in $TO_UNDIVERT2; do
         done
         for cmd in $TO_UNDIVERT2; do

-                undivert_gen $cmd /etc/skel
+            undivert_gen $cmd /etc/skel

         done
         for cmd in $TO_UNDIVERT3; do
         done
         for cmd in $TO_UNDIVERT3; do

-                undivert_gen $cmd /etc/vim
+            undivert_gen $cmd /etc/vim

         done
         done

-     ;;
-   remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-     ;;
+    ;;
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;

     *)
     *)

-      echo "postrm called with unknown argument $1" >&2
-      exit 1
+        echo "postrm called with unknown argument $1" >&2
+        exit 1

 esac
 
 exit 0
 esac
 
 exit 0

diff --git a/debian/preinst b/debian/preinst
index 9a6206f..c30e103 100755 (executable)
--- a/debian/preinst
+++ b/debian/preinst
@@ -21,35 +21,34 @@ backup_conffile() {
 }
 
 case "$1" in
 }
 
 case "$1" in

-   install|upgrade|configure)
+    install|upgrade|configure)

         TMP=$$
         # move files from package grml-etc to grml-etc-core, make sure
         # 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 /etc/tmux.conf; do
         TMP=$$
         # move files from package grml-etc to grml-etc-core, make sure
         # 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 /etc/tmux.conf; do

-               [ -e "$file".original ] || cp -f "$file" "${file}.tmp.$TMP" 2>/dev/null || 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.$TMP" ]      && mv -f "${file}.tmp.$TMP" "$file.original"
-
-               # trying to overwrite `/etc/skel/.zshrc', which is also in package zsh
-               # [ -f /etc/skel/.zshrc ] && \
-               # dpkg-divert --quiet --add --rename --package grml-etc-core --divert /etc/skel/.zshrc.original /etc/skel/.zshrc
+             [ -e "$file".original ] || cp -f "$file" "${file}.tmp.$TMP" 2>/dev/null || true
+             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.$TMP" ]      && mv -f "${file}.tmp.$TMP" "$file.original"
+
+             # trying to overwrite `/etc/skel/.zshrc', which is also in package zsh
+             # [ -f /etc/skel/.zshrc ] && \
+             # dpkg-divert --quiet --add --rename --package grml-etc-core --divert /etc/skel/.zshrc.original /etc/skel/.zshrc

         done
 
         done
 

-       if dpkg-divert --list grml-etc-core 2>/dev/null | grep -q /etc/skel/.zshrc.original ; then
-          mv -f /etc/skel/.zshrc.original /etc/skel/.zshrc.original.old && \
-          dpkg-divert --remove --rename --package grml-etc-core /etc/skel/.zshrc
-       fi
+        if dpkg-divert --list grml-etc-core 2>/dev/null | grep -q /etc/skel/.zshrc.original ; then
+            mv -f /etc/skel/.zshrc.original /etc/skel/.zshrc.original.old && \
+            dpkg-divert --remove --rename --package grml-etc-core /etc/skel/.zshrc
+        fi

 
 

-     ;;
-   *)
-     echo "preinst called with unknown argument $1" >&2
-     exit 1
+    ;;
+    *)
+        echo "preinst called with unknown argument $1" >&2
+        exit 1

 esac
 
 exit 0
 esac
 
 exit 0