separate flags from shebang

diff --git a/mkosi.build b/mkosi.build
index 0781f0d9c4cc79c795f9e4857912ef45ca8b9951..38cfe2502509697e1cf1b78d71ad9f712fcc2d5e 100755 (executable)
--- 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 8d9cdd1836249607a2bf1f562898ee156dee839e..fa74198e58a9071bc035c768dfeb2bed9dff8663 100755 (executable)
--- 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 ee207fb38e63006861055cf2ca653d13f22990ea..e4e7271c4de01add7153f75ad1fbbaaa756df292 100755 (executable)
--- 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 1d4a562e7cffde6a8fe7ee723d8029f21c4fc7de..0628d2425fc91fe56f9b94443c39f8e604ba32fb 100755 (executable)
--- 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 e2bab8b3201053af9f16ad7eeacf6a91c23af957..953d5e37b8180c874e70be56f241c762e04bd35d 100755 (executable)
--- 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 18a540f32baa4355690a437ef3e7f766a45fedae..a9b1e0fb57545c7e22249a3a6ddca82d4a3adf0b 100755 (executable)
--- 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 08b266c455a6134a6df4efa81adaa68442997e45..8572ceedfac5c0823df23b66b44cdb039e423972 100755 (executable)
--- 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 18cbe0599c7fccbc472254b74676a24f23bc583a..2445a02668367f5428e328de663a503dc71165be 100755 (executable)
--- 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 eb977447e3c3b7c8026f18e9ca473bfc826622bb..efb0da2a843457b0daf8df1c1047253de192f564 100755 (executable)
--- 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 7a74e0dae1e63c8cb69534db42f0459d54e77bf2..c055f7c7567f8ea13135a808147221e24235de13 100755 (executable)
--- 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 3918d85ef0ab61fade766a176d4465b8d4b55e52..860c9f1898edbe5d66cee5f78cd671e0f052f3df 100755 (executable)
--- 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 4ee919faf4239a8aecf737c198e54b6e45f24918..c1db99b18af886a1b5e0ff392d50f19f029c5cad 100755 (executable)
--- 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 33b40f93f7e33bdf402a55ac15d23e6790774dc2..06b6297ea5d91efd2349b90c941f473d7073cb0e 100755 (executable)
--- 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 d3b2a312fdd1affa117d55e5d2700c1a682191e0..ce39e1684b8a81516589295369b893afc0a1f970 100755 (executable)
--- 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 4210491a987daa80ee343ef41cd1ea37bc941b6a..69157105f290af2d3e37afeba4ff428e10c6cc56 100755 (executable)
--- 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 c543b3a5fa940a4cc1ec6297c1d55d6dcdb76995..514daa0949a709b26f6530392ea0d3f58f293427 100755 (executable)
--- 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 e9a78c647f0abb2dfaf8997f42fd24e74965680e..275d54cd17ef353856c159f6565768a8454a606d 100755 (executable)
--- 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 47a5e70ae5c5e93e06fd692204428ed52ed86f5a..501cd43d47cb5b66ec8939c9c0b5b0377b18804b 100755 (executable)
--- 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 dfd287e1722aadac586046395640ef3c70fc259e..70f7172ae906019e1863bd4698e950fa55d78861 100755 (executable)
--- 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"