From 7629744a3dbca313b55882d3a63135b2a9b27805 Mon Sep 17 00:00:00 2001
From: bleep_blop <worz@tuta.io>
Date: Sun, 24 Dec 2017 06:53:20 +0000
Subject: [PATCH] separate flags from shebang

---
 mkosi.build                                | 3 ++-
 src/basic/generate-af-list.sh              | 3 ++-
 src/basic/generate-arphrd-list.sh          | 3 ++-
 src/basic/generate-cap-list.sh             | 3 ++-
 src/basic/generate-errno-list.sh           | 3 ++-
 src/basic/generate-socket-protocol-list.sh | 3 ++-
 src/boot/efi/no-undefined-symbols.sh       | 3 ++-
 src/journal/generate-audit_type-list.sh    | 3 ++-
 src/udev/generate-keyboard-keys-gperf.sh   | 3 ++-
 src/udev/generate-keyboard-keys-list.sh    | 3 ++-
 test/networkd-test.py                      | 3 ++-
 tools/add-git-hook.sh                      | 3 ++-
 tools/find-build-dir.sh                    | 3 ++-
 tools/meson-check-compilation.sh           | 3 ++-
 tools/meson-check-help.sh                  | 3 ++-
 tools/meson-git-contrib.sh                 | 3 ++-
 tools/meson-hwdb-update.sh                 | 3 ++-
 tools/meson-make-symlink.sh                | 3 ++-
 units/meson-add-wants.sh                   | 3 ++-
 19 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/mkosi.build b/mkosi.build
index 0781f0d9c4..38cfe25025 100755
--- a/mkosi.build
+++ b/mkosi.build
@@ -1,4 +1,5 @@
-#!/bin/sh -ex
+#!/bin/sh
+set -ex
 
 # This file is part of systemd.
 #
diff --git a/src/basic/generate-af-list.sh b/src/basic/generate-af-list.sh
index 8d9cdd1836..fa74198e58 100755
--- a/src/basic/generate-af-list.sh
+++ b/src/basic/generate-af-list.sh
@@ -1,4 +1,5 @@
-#!/bin/sh -eu
+#!/bin/sh
+set -eu
 
 $1 -E -dM -include sys/socket.h - </dev/null | \
         grep -Ev 'AF_UNSPEC|AF_MAX' | \
diff --git a/src/basic/generate-arphrd-list.sh b/src/basic/generate-arphrd-list.sh
index ee207fb38e..e4e7271c4d 100755
--- a/src/basic/generate-arphrd-list.sh
+++ b/src/basic/generate-arphrd-list.sh
@@ -1,4 +1,5 @@
-#!/bin/sh -eu
+#!/bin/sh
+set -eu
 
 $1 -dM -include net/if_arp.h - </dev/null | \
         awk '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $2; }' | \
diff --git a/src/basic/generate-cap-list.sh b/src/basic/generate-cap-list.sh
index 1d4a562e7c..0628d2425f 100755
--- a/src/basic/generate-cap-list.sh
+++ b/src/basic/generate-cap-list.sh
@@ -1,4 +1,5 @@
-#!/bin/sh -eu
+#!/bin/sh
+set -eu
 
 $1 -dM -include linux/capability.h -include "$2" -include "$3" - </dev/null | \
         awk '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $2; }' | \
diff --git a/src/basic/generate-errno-list.sh b/src/basic/generate-errno-list.sh
index e2bab8b320..953d5e37b8 100755
--- a/src/basic/generate-errno-list.sh
+++ b/src/basic/generate-errno-list.sh
@@ -1,4 +1,5 @@
-#!/bin/sh -eu
+#!/bin/sh
+set -eu
 
 $1 -dM -include errno.h - </dev/null | \
         awk '/^#define[ \t]+E[^ _]+[ \t]+/ { print $2; }'
diff --git a/src/basic/generate-socket-protocol-list.sh b/src/basic/generate-socket-protocol-list.sh
index 18a540f32b..a9b1e0fb57 100755
--- a/src/basic/generate-socket-protocol-list.sh
+++ b/src/basic/generate-socket-protocol-list.sh
@@ -1,4 +1,5 @@
-#!/bin/sh -eu
+#!/bin/sh
+set -eu
 
 $1 -dM -include netinet/in.h - </dev/null | \
         awk '/^#define[ \t]+IPPROTO_[^ \t]+[ \t]+[^ \t]/ { print $2; }' | \
diff --git a/src/boot/efi/no-undefined-symbols.sh b/src/boot/efi/no-undefined-symbols.sh
index 08b266c455..8572ceedfa 100755
--- a/src/boot/efi/no-undefined-symbols.sh
+++ b/src/boot/efi/no-undefined-symbols.sh
@@ -1,4 +1,5 @@
-#!/bin/sh -eu
+#!/bin/sh
+set -eu
 
 if nm -D -u "$1" | grep ' U '; then
         echo "Undefined symbols detected!"
diff --git a/src/journal/generate-audit_type-list.sh b/src/journal/generate-audit_type-list.sh
index 18cbe0599c..2445a02668 100755
--- a/src/journal/generate-audit_type-list.sh
+++ b/src/journal/generate-audit_type-list.sh
@@ -1,4 +1,5 @@
-#!/bin/sh -eu
+#!/bin/sh
+set -eu
 
 cpp="$1"
 shift
diff --git a/src/udev/generate-keyboard-keys-gperf.sh b/src/udev/generate-keyboard-keys-gperf.sh
index eb977447e3..efb0da2a84 100755
--- a/src/udev/generate-keyboard-keys-gperf.sh
+++ b/src/udev/generate-keyboard-keys-gperf.sh
@@ -1,4 +1,5 @@
-#!/bin/sh -eu
+#!/bin/sh
+set -eu
 awk '   BEGIN {
                 print "%{\n\
 #if __GNUC__ >= 7\n\
diff --git a/src/udev/generate-keyboard-keys-list.sh b/src/udev/generate-keyboard-keys-list.sh
index 7a74e0dae1..c055f7c756 100755
--- a/src/udev/generate-keyboard-keys-list.sh
+++ b/src/udev/generate-keyboard-keys-list.sh
@@ -1,4 +1,5 @@
-#!/bin/sh -eu
+#!/bin/sh
+set -eu
 
 $1 -dM -include linux/input.h - </dev/null | awk '
         /\<(KEY_(MAX|MIN_INTERESTING))|(BTN_(MISC|MOUSE|JOYSTICK|GAMEPAD|DIGI|WHEEL|TRIGGER_HAPPY))\>/  { next }
diff --git a/test/networkd-test.py b/test/networkd-test.py
index 3918d85ef0..860c9f1898 100755
--- a/test/networkd-test.py
+++ b/test/networkd-test.py
@@ -720,7 +720,8 @@ class NetworkdClientTest(ClientTestBase, unittest.TestCase):
         self.addCleanup(os.remove, script)
         with os.fdopen(fd, 'w+') as f:
             f.write('''\
-#!/bin/sh -eu
+#!/bin/sh
+set -eu
 mkdir -p /run/systemd/network
 mkdir -p /run/systemd/netif
 mount -t tmpfs none /run/systemd/network
diff --git a/tools/add-git-hook.sh b/tools/add-git-hook.sh
index 4ee919faf4..c1db99b18a 100755
--- a/tools/add-git-hook.sh
+++ b/tools/add-git-hook.sh
@@ -1,4 +1,5 @@
-#!/bin/sh -eu
+#!/bin/sh
+set -eu
 
 cd "$MESON_SOURCE_ROOT"
 
diff --git a/tools/find-build-dir.sh b/tools/find-build-dir.sh
index 33b40f93f7..06b6297ea5 100755
--- a/tools/find-build-dir.sh
+++ b/tools/find-build-dir.sh
@@ -1,4 +1,5 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
 
 # Try to guess the build directory:
 # we look for subdirectories of the parent directory that look like ninja build dirs.
diff --git a/tools/meson-check-compilation.sh b/tools/meson-check-compilation.sh
index d3b2a312fd..ce39e1684b 100755
--- a/tools/meson-check-compilation.sh
+++ b/tools/meson-check-compilation.sh
@@ -1,3 +1,4 @@
-#!/bin/sh -eu
+#!/bin/sh
+set -eu
 
 "$@" '-' -o/dev/null </dev/null
diff --git a/tools/meson-check-help.sh b/tools/meson-check-help.sh
index 4210491a98..69157105f2 100755
--- a/tools/meson-check-help.sh
+++ b/tools/meson-check-help.sh
@@ -1,4 +1,5 @@
-#!/bin/sh -eu
+#!/bin/sh
+set -eu
 
 export SYSTEMD_LOG_LEVEL=info
 
diff --git a/tools/meson-git-contrib.sh b/tools/meson-git-contrib.sh
index c543b3a5fa..514daa0949 100755
--- a/tools/meson-git-contrib.sh
+++ b/tools/meson-git-contrib.sh
@@ -1,4 +1,5 @@
-#!/bin/sh -eu
+#!/bin/sh
+set -eu
 
 git shortlog -s `git describe --abbrev=0`.. | \
         cut -c8- | \
diff --git a/tools/meson-hwdb-update.sh b/tools/meson-hwdb-update.sh
index e9a78c647f..275d54cd17 100755
--- a/tools/meson-hwdb-update.sh
+++ b/tools/meson-hwdb-update.sh
@@ -1,4 +1,5 @@
-#!/bin/sh -eu
+#!/bin/sh
+set -eu
 
 cd "$1"
 
diff --git a/tools/meson-make-symlink.sh b/tools/meson-make-symlink.sh
index 47a5e70ae5..501cd43d47 100755
--- a/tools/meson-make-symlink.sh
+++ b/tools/meson-make-symlink.sh
@@ -1,4 +1,5 @@
-#!/bin/sh -eu
+#!/bin/sh
+set -eu
 
 # this is needed mostly because $DESTDIR is provided as a variable,
 # and we need to create the target directory...
diff --git a/units/meson-add-wants.sh b/units/meson-add-wants.sh
index dfd287e172..70f7172ae9 100755
--- a/units/meson-add-wants.sh
+++ b/units/meson-add-wants.sh
@@ -1,4 +1,5 @@
-#!/bin/sh -eu
+#!/bin/sh
+set -eu
 
 unitdir="$1"
 target="$2"