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.

.dir-locals.el

@@ -20,8 +20,8 @@
  (nxml-mode . ((nxml-child-indent . 2)
                (fill-column . 109)))
  (meson-mode . ((meson-indent-basic . 8)))
- (sh-mode . ((sh-basic-offset . 8)
-             (sh-indentation . 8)))
+ (sh-mode . ((sh-basic-offset . 4)
+             (sh-indentation . 4)))
  (awk-mode . ((c-basic-offset . 8)))
  (nil . ((indent-tabs-mode . nil)
          (tab-width . 8)

.editorconfig

@@ -19,6 +19,10 @@ charset = utf-8
 indent_style = space
 indent_size = 8
 
+[*.sh]
+indent_style = space
+indent_size = 4
+
 [meson.build]
 indent_style = space
 indent_size = 8

.vimrc

@@ -17,4 +17,5 @@ set expandtab
 set makeprg=GCC_COLORS=\ make
 set tw=79
 au BufRead,BufNewFile *.xml set tw=109 shiftwidth=2 smarttab
+au FileType sh set tw=80 shiftwidth=4 smarttab
 au FileType c set tw=109

semaphoreci/gcc-compilation.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 set -ex
 
 # keep this in sync with setup.sh
@@ -40,4 +39,9 @@ dpkg-buildpackage -S -I -I$(basename "$SEMAPHORE_CACHE_DIR") -d -us -uc -nc
 # now build the package and run the tests
 rm -rf "$ARTIFACTS_DIR"
 # autopkgtest exits with 2 for "some tests skipped", accept that
-$AUTOPKGTESTDIR/runner/autopkgtest --apt-upgrade --env DEB_BUILD_OPTIONS=noudeb --env TEST_UPSTREAM=1 ../systemd_*.dsc -o "$ARTIFACTS_DIR" -- lxc -s $CONTAINER || [ $? -eq 2 ]
+$AUTOPKGTESTDIR/runner/autopkgtest --apt-upgrade \
+                                   --env DEB_BUILD_OPTIONS=noudeb \
+                                   --env TEST_UPSTREAM=1 ../systemd_*.dsc \
+                                   -o "$ARTIFACTS_DIR" \
+                                   -- lxc -s $CONTAINER \
+    || [ $? -eq 2 ]

semaphoreci/setup.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 set -ex
 
 # default to Debian testing

src/udev/generate-keyboard-keys-gperf.sh

@@ -1,6 +1,8 @@
 #!/bin/sh
 set -eu
-awk '   BEGIN {
+
+awk '
+    BEGIN {
         print "%{\n\
 #if __GNUC__ >= 7\n\
 _Pragma(\"GCC diagnostic ignored \\\"-Wimplicit-fallthrough\\\"\")\n\

test/TEST-01-BASIC/test.sh

@@ -1,6 +1,4 @@
 #!/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="Basic systemd setup"
 RUN_IN_UNPRIVILEGED_CONTAINER=${RUN_IN_UNPRIVILEGED_CONTAINER:-yes}

test/TEST-02-CRYPTSETUP/test.sh

@@ -1,6 +1,4 @@
 #!/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="cryptsetup systemd setup"
 TEST_NO_NSPAWN=1

test/TEST-03-JOBS/test.sh

@@ -1,6 +1,4 @@
 #!/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="Job-related tests"
 TEST_NO_QEMU=1

test/TEST-04-JOURNAL/test-journal.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 set -x
 set -e
 set -o pipefail

test/TEST-04-JOURNAL/test.sh

@@ -1,6 +1,4 @@
 #!/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="Journal-related tests"
 

test/TEST-05-RLIMITS/test-rlimits.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 set -x
 set -e
 set -o pipefail

test/TEST-05-RLIMITS/test.sh

@@ -1,6 +1,4 @@
 #!/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="Resource limits-related tests"
 

test/TEST-06-SELINUX/test-selinux-checks.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 set -x
 set -e
 set -o pipefail

test/TEST-06-SELINUX/test.sh

@@ -1,6 +1,4 @@
 #!/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="SELinux tests"
 TEST_NO_NSPAWN=1

test/TEST-07-ISSUE-1981/test-segfault.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 set -x
 set -e
 

test/TEST-07-ISSUE-1981/test.sh

@@ -1,6 +1,4 @@
 #!/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="https://github.com/systemd/systemd/issues/1981"
 TEST_NO_QEMU=1

test/TEST-08-ISSUE-2730/test.sh

@@ -1,6 +1,4 @@
 #!/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="https://github.com/systemd/systemd/issues/2730"
 TEST_NO_NSPAWN=1

test/TEST-09-ISSUE-2691/test.sh

@@ -1,6 +1,4 @@
 #!/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="https://github.com/systemd/systemd/issues/2691"
 TEST_NO_NSPAWN=1

test/TEST-10-ISSUE-2467/test.sh

@@ -1,6 +1,4 @@
 #!/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="https://github.com/systemd/systemd/issues/2467"
 

test/TEST-11-ISSUE-3166/test.sh

@@ -1,6 +1,4 @@
 #!/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="https://github.com/systemd/systemd/issues/3166"
 TEST_NO_NSPAWN=1

test/TEST-12-ISSUE-3171/test.sh

@@ -1,6 +1,4 @@
 #!/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="https://github.com/systemd/systemd/issues/3171"
 TEST_NO_QEMU=1

test/TEST-13-NSPAWN-SMOKE/test.sh

@@ -1,6 +1,4 @@
 #!/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="systemd-nspawn smoke test"
 TEST_NO_NSPAWN=1

test/TEST-14-MACHINE-ID/test.sh

@@ -1,6 +1,4 @@
 #!/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="/etc/machine-id testing"
 TEST_NO_NSPAWN=1

test/TEST-15-DROPIN/test-dropin.sh

@@ -1,5 +1,4 @@
 #! /bin/bash
-
 set -e
 set -x
 
@@ -45,7 +44,7 @@ check_ok () {
     x="$(systemctl show --value -p $2 $1)"
     case "$x" in
         *$3*) return 0 ;;
-        *)         return 1
+        *)    return 1 ;;
     esac
 }
 

test/TEST-15-DROPIN/test.sh

@@ -1,6 +1,4 @@
 #!/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="Dropin tests"
 TEST_NO_QEMU=1

test/TEST-16-EXTEND-TIMEOUT/test.sh

@@ -1,6 +1,4 @@
 #!/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="EXTEND_TIMEOUT_USEC=usec start/runtime/stop tests"
 SKIP_INITRD=yes

test/TEST-17-UDEV-WANTS/test.sh

@@ -1,6 +1,4 @@
 #!/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="UDEV SYSTEMD_WANTS property"
 TEST_NO_NSPAWN=1

test/TEST-17-UDEV-WANTS/testsuite.sh

@@ -1,6 +1,4 @@
 #!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
 set -ex
 set -o pipefail
 

test/TEST-18-FAILUREACTION/test.sh

@@ -1,6 +1,4 @@
 #!/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="FailureAction= operation"
 

test/TEST-18-FAILUREACTION/testsuite.sh

@@ -1,6 +1,4 @@
 #!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
 set -ex
 set -o pipefail
 

test/TEST-19-DELEGATE/test.sh

@@ -1,6 +1,4 @@
 #!/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="test cgroup delegation in the unified hierarchy"
 TEST_NO_NSPAWN=1

test/TEST-19-DELEGATE/testsuite.sh

@@ -1,6 +1,4 @@
 #!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
 set -ex
 set -o pipefail
 

test/TEST-20-MAINPIDGAMES/test.sh

@@ -1,6 +1,4 @@
 #!/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="test changing main PID"
 

test/TEST-20-MAINPIDGAMES/testsuite.sh

@@ -1,6 +1,4 @@
 #!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
 set -ex
 set -o pipefail
 

test/TEST-21-SYSUSERS/test.sh

@@ -1,6 +1,4 @@
 #!/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/TEST-22-TMPFILES/test.sh

@@ -1,6 +1,4 @@
 #!/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="Tmpfiles related tests"
 TEST_NO_QEMU=1

test/TEST-23-TYPE-EXEC/test.sh

@@ -1,6 +1,4 @@
 #!/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="test Type=exec"
 

test/TEST-23-TYPE-EXEC/testsuite.sh

@@ -1,6 +1,4 @@
 #!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
 set -ex
 set -o pipefail
 

test/TEST-24-UNIT-TESTS/test.sh

@@ -1,6 +1,4 @@
 #!/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="Run unit tests under containers"
 RUN_IN_UNPRIVILEGED_CONTAINER=yes

test/TEST-24-UNIT-TESTS/testsuite.sh

@@ -1,6 +1,4 @@
 #!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
 #set -ex
 #set -o pipefail
 

test/TEST-25-IMPORT/test.sh

@@ -1,6 +1,4 @@
 #!/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="test importd"
 

test/TEST-25-IMPORT/testsuite.sh

@@ -1,6 +1,4 @@
 #!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
 set -ex
 set -o pipefail
 

test/TEST-26-SETENV/test.sh

@@ -1,6 +1,4 @@
 #!/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="test setenv"
 

test/TEST-26-SETENV/testsuite.sh

@@ -1,6 +1,4 @@
 #!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
 set -ex
 set -o pipefail
 

test/TEST-27-STDOUTFILE/test.sh

@@ -1,6 +1,4 @@
 #!/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="test StandardOutput=file:"
 

test/TEST-27-STDOUTFILE/testsuite.sh

@@ -1,13 +1,15 @@
 #!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
 set -ex
 set -o pipefail
 
 systemd-analyze log-level debug
 systemd-analyze log-target console
 
-systemd-run --wait --unit=one -p StandardOutput=file:/tmp/stdout -p StandardError=file:/tmp/stderr -p Type=exec sh -c 'echo x ; echo y >&2'
+systemd-run --wait --unit=one \
+            -p StandardOutput=file:/tmp/stdout \
+            -p StandardError=file:/tmp/stderr \
+            -p Type=exec \
+            sh -c 'echo x ; echo y >&2'
 cmp /tmp/stdout <<EOF
 x
 EOF
@@ -15,7 +17,11 @@ cmp /tmp/stderr <<EOF
 y
 EOF
 
-systemd-run --wait --unit=two -p StandardOutput=file:/tmp/stdout -p StandardError=file:/tmp/stderr -p Type=exec sh -c 'echo z ; echo a >&2'
+systemd-run --wait --unit=two \
+            -p StandardOutput=file:/tmp/stdout \
+            -p StandardError=file:/tmp/stderr \
+            -p Type=exec \
+            sh -c 'echo z ; echo a >&2'
 cmp /tmp/stdout <<EOF
 z
 EOF
@@ -23,7 +29,11 @@ cmp /tmp/stderr <<EOF
 a
 EOF
 
-systemd-run --wait --unit=three -p StandardOutput=append:/tmp/stdout -p StandardError=append:/tmp/stderr -p Type=exec sh -c 'echo b ; echo c >&2'
+systemd-run --wait --unit=three \
+            -p StandardOutput=append:/tmp/stdout \
+            -p StandardError=append:/tmp/stderr \
+            -p Type=exec \
+            sh -c 'echo b ; echo c >&2'
 cmp /tmp/stdout <<EOF
 z
 b

test/TEST-28-PERCENTJ-WANTEDBY/test.sh

@@ -1,6 +1,4 @@
 #!/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="Ensure %j Wants directives work"
 RUN_IN_UNPRIVILEGED_CONTAINER=yes

test/TEST-29-UDEV-ID_RENAMING/test.sh

@@ -1,6 +1,4 @@
 #!/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="UDEV ID_RENAMING property"
 TEST_NO_NSPAWN=1

test/TEST-29-UDEV-ID_RENAMING/testsuite.sh

@@ -1,6 +1,4 @@
 #!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
 set -ex
 set -o pipefail
 

test/TEST-30-ONCLOCKCHANGE/test.sh

@@ -1,6 +1,4 @@
 #!/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="test OnClockChange= + OnTimezoneChange="
 TEST_NO_NSPAWN=1

test/TEST-30-ONCLOCKCHANGE/testsuite.sh

@@ -1,6 +1,4 @@
 #!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
 set -ex
 set -o pipefail
 

test/TEST-31-DEVICE-ENUMERATION/test.sh

@@ -1,6 +1,4 @@
 #!/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="plugged -> dead -> plugged issue #11997"
 TEST_NO_NSPAWN=1

test/TEST-31-DEVICE-ENUMERATION/testsuite.sh

@@ -1,6 +1,4 @@
 #!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
 set -ex
 set -o pipefail
 

test/test-functions

@@ -159,15 +159,15 @@ run_qemu() {
         exit 1
     fi
 
-if [[ "$LOOKS_LIKE_SUSE" ]]; then
+    if [[ "$LOOKS_LIKE_SUSE" ]]; then
         PARAMS+="rd.hostonly=0"
-elif [[ "$LOOKS_LIKE_ARCH" ]]; then
+    elif [[ "$LOOKS_LIKE_ARCH" ]]; then
         PARAMS+="rw"
-else
+    else
         PARAMS+="ro"
-fi
+    fi
 
-KERNEL_APPEND="$PARAMS \
+    KERNEL_APPEND="$PARAMS \
 root=/dev/sda1 \
 raid=noautodetect \
 loglevel=2 \
@@ -1639,7 +1639,7 @@ do_test() {
         exit 0
     fi
 
-# Detect lib paths
+    # Detect lib paths
     [[ $libdir ]] || for libdir in /lib64 /lib; do
         [[ -d $libdir ]] && libdirs+=" $libdir" && break
     done

tools/check-directives.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 set -e
 
 function generate_directives() {

tools/choose-default-locale.sh

@@ -1,5 +1,4 @@
 #!/bin/sh
-
 set -e
 
 # Fedora uses C.utf8 but Debian uses C.UTF-8

tools/coverity.sh

@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/bin/bash
 
 # The official unmodified version of the script can be found at
 # https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh

tools/find-double-newline.sh

@@ -4,7 +4,6 @@
 TOP=`git rev-parse --show-toplevel`
 
 case "$1" in
-
     recdiff)
         if [ "$2" = "" ] ; then
             DIR="$TOP"

tools/find-tabs.sh

@@ -4,7 +4,6 @@
 TOP=`git rev-parse --show-toplevel`
 
 case "$1" in
-
     recdiff)
         if [ "$2" = "" ] ; then
             DIR="$TOP"

tools/meson-check-api-docs.sh

@@ -1,5 +1,4 @@
 #!/bin/sh
-
 set -eu
 
 sd_good=0

travis-ci/managers/xenial.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 set -e
 set -x
 

travis-ci/scripts/build-docker-image.sh

@@ -7,7 +7,7 @@
 echo -e "\n\033[33;1mBuilding docker image: coverity-$TRAVIS_COMMIT.\033[0m"
 
 docker build \
---build-arg DOCKER_USER=$USER \
---build-arg DOCKER_USER_UID=`id -u` \
---build-arg DOCKER_USER_GID=`id -g` \
---force-rm -t coverity-${TRAVIS_COMMIT} --pull=true .
+       --build-arg DOCKER_USER=$USER \
+       --build-arg DOCKER_USER_UID=`id -u` \
+       --build-arg DOCKER_USER_GID=`id -g` \
+       --force-rm -t coverity-${TRAVIS_COMMIT} --pull=true .