[pkg-firebird-general] more pretty

[Tamas TEVESZ]

some more pretty like the previous one, plus

- hunk #2: better safe than sorry
- hunks #3 and #5 were the wtf-faces of the week

the diff is against the 2.0 tree, selected parts (that is, everything 
except the get-orig.sh stuff) could go straight in 1.5 as well.


Index: debian/functions.sh
===================================================================
--- debian/functions.sh	(revision 997)
+++ debian/functions.sh	(working copy)
@@ -1,13 +1,13 @@
 # Shell functions library used by firebird2.0-{super,classic}.postinst
 # This file needs to be sourced
 
-if [ -z "${FB_VER:-}" ];
+if [ -z "${FB_VER}" ];
 then
     echo Please define FB_VER before sourcing functions.sh
     exit 1
 fi
 
-if [ -z "${FB_FLAVOUR:-}" ];
+if [ -z "${FB_FLAVOUR}" ];
 then
     echo Please define FB_FLAVOUR before sourcing functions.sh
     exit 1
@@ -268,7 +268,7 @@
     db_get "$QUESTION" || true
     if [ -z "$RET" ];
     then
-        if [ -z "${ISC_PASSWORD:-}" ];
+        if [ -z "${ISC_PASSWORD}" ];
         then
             NewPassword=`cut -c 1-8 < /proc/sys/kernel/random/uuid`
         else
Index: debian/get-orig-source.sh
===================================================================
--- debian/get-orig-source.sh	(revision 997)
+++ debian/get-orig-source.sh	(working copy)
@@ -5,6 +5,11 @@
 
 TMPDIR=`mktemp -d -p .`
 
+if [ -z "$TMPDIR" ]; then
+    echo "Can not create temporary directory"
+    exit 1
+fi
+
 trap "rm -rf $TMPDIR" INT QUIT 0
 
 VER="2.0.1~rc1.12810.ds1"
Index: debian/firebird2.0-super.postrm
===================================================================
--- debian/firebird2.0-super.postrm	(revision 997)
+++ debian/firebird2.0-super.postrm	(working copy)
@@ -54,13 +54,7 @@
                 db_get shared/firebird/purge_databases
                 if [ "$RET" = 'true' ]; then
                     DB_DIR="/var/lib/firebird/$FB_VER/data"
-
-                    find $DB_DIR -type f \( -name "*.fdb" -o -name "*.fbk" \) \
-                        | (
-                            while read f; do
-                                rm "$f"
-                            done
-                        )
+                    find $DB_DIR -type f '(' -name "*.fdb" -o -name "*.fbk" ')' -exec rm '{}' ';'
                 fi
             fi
         fi
Index: debian/firebird-utils.wrapper
===================================================================
--- debian/firebird-utils.wrapper	(revision 997)
+++ debian/firebird-utils.wrapper	(working copy)
@@ -24,7 +24,7 @@
     exit 1
 fi
 
-if [ -n "${FB_VER:-}" ]; then
+if [ -n "${FB_VER}" ]; then
     export FIREBIRD="$BASE/$FB_VER"
 
     if [ -x "/usr/bin/$PROG-$FB_VER" ];
Index: debian/firebird2.0-classic.postrm
===================================================================
--- debian/firebird2.0-classic.postrm	(revision 997)
+++ debian/firebird2.0-classic.postrm	(working copy)
@@ -68,13 +68,7 @@
                 db_get shared/firebird/purge_databases
                 if [ "$RET" = 'true' ]; then
                     DB_DIR="/var/lib/firebird/$FB_VER/data"
-
-                    find $DB_DIR -type f \( -name "*.fdb" -o -name "*.fbk" \) \
-                        | (
-                            while read f; do
-                                rm "$f"
-                            done
-                        )
+                    find $DB_DIR -type f '(' -name "*.fdb" -o -name "*.fbk" ')' -exec rm '{}' ';'
                 fi
             fi
         fi
Index: debian/firebird2.0-super.postinst
===================================================================
--- debian/firebird2.0-super.postinst	(revision 997)
+++ debian/firebird2.0-super.postinst	(working copy)
@@ -5,7 +5,7 @@
 . /usr/share/debconf/confmodule
 set -u
 
-if [ -n "${DEBIAN_FIREBIRD_DEBUG:-}" ]; then
+if [ -n "${DEBIAN_FIREBIRD_DEBUG}" ]; then
     set -x
 fi
 # summary of how this script can be called:
Index: debian/server-config.master
===================================================================
--- debian/server-config.master	(revision 997)
+++ debian/server-config.master	(working copy)
@@ -6,7 +6,7 @@
 
 set -u
 
-if [ -n "${DEBIAN_FIREBIRD_DEBUG:-}" ]; then
+if [ -n "${DEBIAN_FIREBIRD_DEBUG}" ]; then
     set -x
 fi
 
Index: debian/firebird2.0-classic.postinst
===================================================================
--- debian/firebird2.0-classic.postinst	(revision 997)
+++ debian/firebird2.0-classic.postinst	(working copy)
@@ -5,7 +5,7 @@
 . /usr/share/debconf/confmodule
 set -u
 
-if [ -n "${DEBIAN_FIREBIRD_DEBUG:-}" ]; then
+if [ -n "${DEBIAN_FIREBIRD_DEBUG}" ]; then
     set -x
 fi
 # summary of how this script can be called:

-- 
[-]

mkdir /nonexistent