Browse Source

Shell script cleanup

* Apply shfmt
* Run with "nounset"
Christoph Biedl 1 year ago
parent
commit
51dde7b2bc
2 changed files with 58 additions and 58 deletions
  1. 41 41
      debian/tang-common.postinst
  2. 17 17
      debian/tang-xinetd.postinst

+ 41 - 41
debian/tang-common.postinst

@@ -1,49 +1,49 @@
 #!/bin/sh
 
-set -e
+set -eu
 
-DB_DIR_OLD=/var/db/tang
-DB_DIR=/var/lib/tang
+db_dir_old='/var/db/tang'
+db_dir='/var/lib/tang'
 
 case "$1" in
-configure)
-    if ! getent passwd _tang >/dev/null; then
-        adduser --quiet --system --group --no-create-home --home /nonexistent --force-badname _tang
-    fi
-
-    # Migrate tang db:
-    # * Change location
-    # * Give it to _tang user
-    # This cannot be anchored to a version since the initial setup used
-    # to be in the tang package.
-    # (Retire after bookworm release)
-    if \
-        [ -d "$DB_DIR_OLD" ] &&
-        [ ! -d "$DB_DIR" ]
-    then
-        echo 'I: Migrating tang db'
-        mv "$DB_DIR_OLD" "$DB_DIR"
-        chown -R _tang:_tang "$DB_DIR"
-    fi
-
-    # Possibly remove /var/db/
-    # (Retire after bookworm release)
-    if [ -d /var/db/ ] ; then
-        rmdir /var/db/ >/dev/null 2>&1 || :
-    fi
-
-    # assert db directory
-    mkdir -p "$DB_DIR"
-    chown _tang:_tang "$DB_DIR"
-    chmod 0750 "$DB_DIR"
-
-    ;;
-abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-*)
-    echo "postinst called with unknown argument '$1'" >&2
-    exit 1
-    ;;
+    configure)
+        if ! getent passwd _tang >/dev/null; then
+            adduser --quiet --system --group --no-create-home --home /nonexistent --force-badname _tang
+        fi
+
+        # Migrate tang db:
+        # * Change location
+        # * Give it to _tang user
+        # This cannot be anchored to a version since the initial setup used
+        # to be in the tang package.
+        # (Retire after bookworm release)
+        if
+            [ -d "$db_dir_old" ] &&
+                [ ! -d "$db_dir" ]
+        then
+            echo 'I: Migrating tang db'
+            mv "$db_dir_old" "$db_dir"
+            chown -R _tang:_tang "$db_dir"
+        fi
+
+        # Possibly remove /var/db/
+        # (Retire after bookworm release)
+        if [ -d /var/db/ ]; then
+            rmdir /var/db/ >/dev/null 2>&1 || :
+        fi
+
+        # assert db directory
+        mkdir -p "$db_dir"
+        chown _tang:_tang "$db_dir"
+        chmod 0750 "$db_dir"
+
+        ;;
+    abort-upgrade | abort-remove | abort-deconfigure) ;;
+
+    *)
+        echo "postinst called with unknown argument '$1'" >&2
+        exit 1
+        ;;
 esac
 
 #DEBHELPER#

+ 17 - 17
debian/tang-xinetd.postinst

@@ -1,27 +1,27 @@
 #!/bin/sh
 
-set -e
+set -eu
 
-LOG=/var/log/tangd.log
+log='/var/log/tangd.log'
 
 case "$1" in
-configure)
-    if ! getent passwd _tang >/dev/null; then
-        adduser --quiet --system --group --no-create-home --home /nonexistent --force-badname _tang
-    fi
+    configure)
+        if ! getent passwd _tang >/dev/null; then
+            adduser --quiet --system --group --no-create-home --home /nonexistent --force-badname _tang
+        fi
 
-    [ -f "$LOG" ] || install \
-        --owner=_tang --group=_tang \
-        --mode=644 \
-        /dev/null "$LOG"
+        [ -f "$log" ] || install \
+            --owner=_tang --group=_tang \
+            --mode=644 \
+            /dev/null "$log"
 
-    ;;
-abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-*)
-    echo "postinst called with unknown argument '$1'" >&2
-    exit 1
-    ;;
+        ;;
+    abort-upgrade | abort-remove | abort-deconfigure) ;;
+
+    *)
+        echo "postinst called with unknown argument '$1'" >&2
+        exit 1
+        ;;
 esac
 
 #DEBHELPER#