diff --git a/ci/audit.sh b/ci/audit.sh
index a5a554962b..a23d3d840d 100755
--- a/ci/audit.sh
+++ b/ci/audit.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
-set -e
 #
 # Audits project dependencies for security vulnerabilities
 #
+set -e
 
 cd "$(dirname "$0")/.."
 
diff --git a/ci/crate-version.sh b/ci/crate-version.sh
index f2ca748f77..a33e6faa33 100755
--- a/ci/crate-version.sh
+++ b/ci/crate-version.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
-set -e
 #
 # Outputs the current crate version
 #
+set -e
 
 cd "$(dirname "$0")"/..
 
diff --git a/ci/run-local.sh b/ci/run-local.sh
index 55e0a2fd5a..3fce495c26 100755
--- a/ci/run-local.sh
+++ b/ci/run-local.sh
@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
-set -e
 #
 # Run the entire buildkite CI pipeline locally for pre-testing before sending a
 # Github pull request
 #
+set -e
 
 cd "$(dirname "$0")/.."
 BKRUN=ci/node_modules/.bin/bkrun
diff --git a/ci/shellcheck.sh b/ci/shellcheck.sh
index 669e3bd6f7..4149d62a4e 100755
--- a/ci/shellcheck.sh
+++ b/ci/shellcheck.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
-set -e
 #
 # Reference: https://github.com/koalaman/shellcheck/wiki/Directive
+set -e
 
 cd "$(dirname "$0")/.."
 
diff --git a/net/gce.sh b/net/gce.sh
index dcc3780705..2b97a27352 100755
--- a/net/gce.sh
+++ b/net/gce.sh
@@ -382,8 +382,8 @@ EOF
   declare startupScript="$netConfigDir"/instance-startup-script.sh
   cat > "$startupScript" <<EOF
 #!/usr/bin/env bash
-set -ex
 # autogenerated at $(date)
+set -ex
 
 cat > /etc/motd <<EOM
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/net/scripts/install-rsync.sh b/net/scripts/install-rsync.sh
index ac2b06a0de..75839229a1 100755
--- a/net/scripts/install-rsync.sh
+++ b/net/scripts/install-rsync.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
-set -ex
 #
 # Rsync setup for Snap builds
 #
+set -ex
 
 [[ $(uname) = Linux ]] || exit 1
 [[ $USER = root ]] || exit 1
diff --git a/net/scripts/network-config.sh b/net/scripts/network-config.sh
index cc8429306f..18a2a4b83c 100755
--- a/net/scripts/network-config.sh
+++ b/net/scripts/network-config.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 set -ex
-#
 
 [[ $(uname) = Linux ]] || exit 1
 [[ $USER = root ]] || exit 1
diff --git a/net/scripts/update-default-cuda.sh b/net/scripts/update-default-cuda.sh
index 6912cff540..0c8fb7146d 100755
--- a/net/scripts/update-default-cuda.sh
+++ b/net/scripts/update-default-cuda.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
-set -ex
 #
 # Updates the default cuda symlink to the supported version
 #
+set -ex
 
 [[ $(uname) = Linux ]] || exit 1
 [[ $USER = root ]] || exit 1
diff --git a/scripts/install-native-programs.sh b/scripts/install-native-programs.sh
index 3cf1ee9459..c39064a933 100755
--- a/scripts/install-native-programs.sh
+++ b/scripts/install-native-programs.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
-set -e
 #
 # Installs native programs as |cargo install| doesn't know about them
 #
+set -e
 
 here=$(dirname "$0")
 SOLANA_ROOT="$(cd "$here"/..; pwd)"
diff --git a/scripts/metrics-write-datapoint.sh b/scripts/metrics-write-datapoint.sh
index 42dbf0b4eb..3633dab3b3 100755
--- a/scripts/metrics-write-datapoint.sh
+++ b/scripts/metrics-write-datapoint.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
-set -e
 #
 # Send a metrics datapoint
 #
+set -e
 
 point=$1
 if [[ -z $point ]]; then
diff --git a/scripts/net-stats.sh b/scripts/net-stats.sh
index 1945d3580c..536d410b74 100755
--- a/scripts/net-stats.sh
+++ b/scripts/net-stats.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
-set -e
 #
 # Reports network statistics
 #
+set -e
 
 [[ $(uname) == Linux ]] || exit 0
 
diff --git a/scripts/oom-monitor.sh b/scripts/oom-monitor.sh
index 9eeb99cdc2..52895e81f7 100755
--- a/scripts/oom-monitor.sh
+++ b/scripts/oom-monitor.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
-set -e
 #
 # Reports Linux OOM Killer activity
 #
+set -e
 
 cd "$(dirname "$0")"
 
diff --git a/scripts/wallet-sanity.sh b/scripts/wallet-sanity.sh
index b0702df563..6026cbaee5 100755
--- a/scripts/wallet-sanity.sh
+++ b/scripts/wallet-sanity.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
-set -e
 #
 # Wallet sanity test
 #
+set -e
 
 cd "$(dirname "$0")"/..