scripts: use 4 space indentation

We had all kinds of indentation: 2 sp, 3 sp, 4 sp, 8 sp, and mixed.
4 sp was the most common, in particular the majority of scripts under test/
used that. Let's standarize on 4 sp, because many commandlines are long and
there's a lot of nesting, and with 8sp indentation less stuff fits. 4 sp
also seems to be the default indentation, so this will make it less likely
that people will mess up if they don't load the editor config. (I think people
often use vi, and vi has no support to load project-wide configuration
automatically. We distribute a .vimrc file, but it is not loaded by default,
and even the instructions in it seem to discourage its use for security
reasons.)

Also remove the few vim config lines that were left. We should either have them
on all files, or none.

Also remove some strange stuff like '#!/bin/env bash', yikes.

1 files changed, 85 insertions, 87 deletions

diff --git a/test/TEST-21-SYSUSERS/test.sh b/test/TEST-21-SYSUSERS/test.sh
index b1049e720d..9f64e030b5 100755
--- a/test/TEST-21-SYSUSERS/test.sh
+++ b/test/TEST-21-SYSUSERS/test.sh
@@ -1,21 +1,19 @@
 #!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
 set -e
 TEST_DESCRIPTION="Sysuser-related tests"
 
 . $TEST_BASE_DIR/test-functions
 
 test_setup() {
-        mkdir -p $TESTDIR/etc/sysusers.d $TESTDIR/usr/lib/sysusers.d $TESTDIR/tmp
+    mkdir -p $TESTDIR/etc/sysusers.d $TESTDIR/usr/lib/sysusers.d $TESTDIR/tmp
 }
 
 prepare_testdir() {
-        rm -f $TESTDIR/etc/*{passwd,group,shadow}
-        for i in $1.initial-{passwd,group,shadow}; do
-                test -f $i && cp $i $TESTDIR/etc/${i#*.initial-}
-        done
-        return 0
+    rm -f $TESTDIR/etc/*{passwd,group,shadow}
+    for i in $1.initial-{passwd,group,shadow}; do
+        test -f $i && cp $i $TESTDIR/etc/${i#*.initial-}
+    done
+    return 0
 }
 
 preprocess() {
@@ -30,92 +28,92 @@ preprocess() {
 
 compare() {
     if ! diff -u $TESTDIR/etc/passwd <(preprocess ${1%.*}.expected-passwd); then
-            echo "**** Unexpected output for $f"
-            exit 1
+        echo "**** Unexpected output for $f"
+        exit 1
     fi
 
     if ! diff -u $TESTDIR/etc/group <(preprocess ${1%.*}.expected-group); then
-            echo "**** Unexpected output for $f $2"
-            exit 1
+        echo "**** Unexpected output for $f $2"
+        exit 1
     fi
 }
 
 test_run() {
-        # ensure our build of systemd-sysusers is run
-        PATH=${BUILD_DIR}:$PATH
-
-        rm -f $TESTDIR/etc/sysusers.d/* $TESTDIR/usr/lib/sysusers.d/*
-
-        # happy tests
-        for f in test-*.input; do
-                echo "*** Running $f"
-                prepare_testdir ${f%.input}
-                cp $f $TESTDIR/usr/lib/sysusers.d/test.conf
-                systemd-sysusers --root=$TESTDIR
-
-                compare $f ""
-        done
-
-        for f in test-*.input; do
-                echo "*** Running $f on stdin"
-                prepare_testdir ${f%.input}
-                touch $TESTDIR/etc/sysusers.d/test.conf
-                cat $f | systemd-sysusers --root=$TESTDIR -
-
-                compare $f "on stdin"
-        done
-
-        for f in test-*.input; do
-                echo "*** Running $f on stdin with --replace"
-                prepare_testdir ${f%.input}
-                touch $TESTDIR/etc/sysusers.d/test.conf
-                # this overrides test.conf which is masked on disk
-                cat $f | systemd-sysusers --root=$TESTDIR --replace=/etc/sysusers.d/test.conf -
-                # this should be ignored
-                cat test-1.input | systemd-sysusers --root=$TESTDIR --replace=/usr/lib/sysusers.d/test.conf -
-
-                compare $f "on stdin with --replace"
-        done
-
-        # test --inline
-        echo "*** Testing --inline"
-        prepare_testdir
-        # copy a random file to make sure it is ignored
-        cp $f $TESTDIR/etc/sysusers.d/confuse.conf
-        systemd-sysusers --root=$TESTDIR --inline \
-                         "u     u1   222 -     - /bin/zsh" \
-                         "g     g1   111"
-
-        compare inline "(--inline)"
-
-        # test --replace
-        echo "*** Testing --inline with --replace"
-        prepare_testdir
-        # copy a random file to make sure it is ignored
-        cp $f $TESTDIR/etc/sysusers.d/confuse.conf
-        systemd-sysusers --root=$TESTDIR \
-                         --inline \
-                         --replace=/etc/sysusers.d/confuse.conf \
-                         "u     u1   222 -     - /bin/zsh" \
-                         "g     g1   111"
-
-        compare inline "(--inline --replace=…)"
-
-        rm -f $TESTDIR/etc/sysusers.d/* $TESTDIR/usr/lib/sysusers.d/*
-
-        # tests for error conditions
-        for f in unhappy-*.input; do
-                echo "*** Running test $f"
-                prepare_testdir ${f%.input}
-                cp $f $TESTDIR/usr/lib/sysusers.d/test.conf
-                systemd-sysusers --root=$TESTDIR 2> /dev/null
-                journalctl -t systemd-sysusers -o cat | tail -n1 > $TESTDIR/tmp/err
-                if ! diff -u $TESTDIR/tmp/err  ${f%.*}.expected-err; then
-                        echo "**** Unexpected error output for $f"
-                        cat $TESTDIR/tmp/err
-                        exit 1
-                fi
-        done
+    # ensure our build of systemd-sysusers is run
+    PATH=${BUILD_DIR}:$PATH
+
+    rm -f $TESTDIR/etc/sysusers.d/* $TESTDIR/usr/lib/sysusers.d/*
+
+    # happy tests
+    for f in test-*.input; do
+        echo "*** Running $f"
+        prepare_testdir ${f%.input}
+        cp $f $TESTDIR/usr/lib/sysusers.d/test.conf
+        systemd-sysusers --root=$TESTDIR
+
+        compare $f ""
+    done
+
+    for f in test-*.input; do
+        echo "*** Running $f on stdin"
+        prepare_testdir ${f%.input}
+        touch $TESTDIR/etc/sysusers.d/test.conf
+        cat $f | systemd-sysusers --root=$TESTDIR -
+
+        compare $f "on stdin"
+    done
+
+    for f in test-*.input; do
+        echo "*** Running $f on stdin with --replace"
+        prepare_testdir ${f%.input}
+        touch $TESTDIR/etc/sysusers.d/test.conf
+        # this overrides test.conf which is masked on disk
+        cat $f | systemd-sysusers --root=$TESTDIR --replace=/etc/sysusers.d/test.conf -
+        # this should be ignored
+        cat test-1.input | systemd-sysusers --root=$TESTDIR --replace=/usr/lib/sysusers.d/test.conf -
+
+        compare $f "on stdin with --replace"
+    done
+
+    # test --inline
+    echo "*** Testing --inline"
+    prepare_testdir
+    # copy a random file to make sure it is ignored
+    cp $f $TESTDIR/etc/sysusers.d/confuse.conf
+    systemd-sysusers --root=$TESTDIR --inline \
+                     "u     u1   222 -     - /bin/zsh" \
+                     "g     g1   111"
+
+    compare inline "(--inline)"
+
+    # test --replace
+    echo "*** Testing --inline with --replace"
+    prepare_testdir
+    # copy a random file to make sure it is ignored
+    cp $f $TESTDIR/etc/sysusers.d/confuse.conf
+    systemd-sysusers --root=$TESTDIR \
+                     --inline \
+                     --replace=/etc/sysusers.d/confuse.conf \
+                     "u     u1   222 -     - /bin/zsh" \
+                     "g     g1   111"
+
+    compare inline "(--inline --replace=…)"
+
+    rm -f $TESTDIR/etc/sysusers.d/* $TESTDIR/usr/lib/sysusers.d/*
+
+    # tests for error conditions
+    for f in unhappy-*.input; do
+        echo "*** Running test $f"
+        prepare_testdir ${f%.input}
+        cp $f $TESTDIR/usr/lib/sysusers.d/test.conf
+        systemd-sysusers --root=$TESTDIR 2> /dev/null
+        journalctl -t systemd-sysusers -o cat | tail -n1 > $TESTDIR/tmp/err
+        if ! diff -u $TESTDIR/tmp/err  ${f%.*}.expected-err; then
+            echo "**** Unexpected error output for $f"
+            cat $TESTDIR/tmp/err
+            exit 1
+        fi
+    done
 }
 
 do_test "$@"