Fix shebang lines for NixOS compatibility

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/171)

diff --git a/release-tools/release-aux/test_suite.sh b/release-tools/release-aux/test_suite.sh
index 42862c47bfe33278935f1b23c710e28017c522bd..9ecf735b26a066bc8897d52a8b95651b50394735 100755 (executable)
--- a/release-tools/release-aux/test_suite.sh
+++ b/release-tools/release-aux/test_suite.sh
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
 # Copyright 2023 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the Apache License 2.0 (the "License").  You may not use

diff --git a/release-tools/stage-release.sh b/release-tools/stage-release.sh
index 475689baa4d2f4ff94f78d862a97f23aaa0e87c0..4a311497f4cb8fbba1244f30805422cee63454c4 100755 (executable)
--- a/release-tools/stage-release.sh
+++ b/release-tools/stage-release.sh
@@ -1,4 +1,4 @@
-#! /bin/bash -e
+#! /usr/bin/env bash
 # Copyright 2020-2023 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -6,6 +6,8 @@
 # in the file LICENSE in the source distribution or at
 # https://www.openssl.org/source/license.html
 
+set -e
+
 # This is the most shell agnostic way to specify that POSIX rules.
 POSIXLY_CORRECT=1
 

diff --git a/review-tools/ghmerge b/review-tools/ghmerge
index 41e3faefd6a350972ce8a86bc1ff3171ca52f331..38733165bb40bcd609d9019354bcdcb0e8e8efa7 100755 (executable)
--- a/review-tools/ghmerge
+++ b/review-tools/ghmerge
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
 
 function usage_exit {
     >&2 echo "Usage: ghmerge <options including prnum and reviewer(s)>

diff --git a/review-tools/opensslbuild b/review-tools/opensslbuild
index dcb8e62b8d46bced3686bf52026bd0452f552717..e2ea31bbd11494840253f8f4ded2a70121d330bd 100755 (executable)
--- a/review-tools/opensslbuild
+++ b/review-tools/opensslbuild
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
 # Script to build openssl and run regression tests.
 # Usage:
 #       opensslbuild [-c] [-x] [config_args...]

diff --git a/review-tools/opensslpull b/review-tools/opensslpull
index 8caedf542b65f38fe3d80c962a0e70ffd92ff9df..8bb6e2465684088570363f1b0c9c8caafc9e1c06 100755 (executable)
--- a/review-tools/opensslpull
+++ b/review-tools/opensslpull
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
 # Script to fetch and rebase openssl branches
 
 test -f ./config || {

diff --git a/review-tools/pick-to-branch b/review-tools/pick-to-branch
index 7fc7e7850e320db15cdb8f0ee9f9ba1bc39784f5..11d2de4c1aa68d75b6b1fe085407b36ffa81fa7a 100755 (executable)
--- a/review-tools/pick-to-branch
+++ b/review-tools/pick-to-branch
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
 
 function usage {
     echo "Usage: pick-to-branch [<id> | h | HEAD ] <target> [<num>]