From 24d6af65d6ed58b3ee32a5b26f360a2fd8594ddd Mon Sep 17 00:00:00 2001
From: John Axel Eriksson <john@insane.se>
Date: Fri, 4 Dec 2020 19:22:30 +0100
Subject: [PATCH] fix: Make bash scripts more portable by referencing
 `/usr/bin/env` (#756)

---
 autogen/main/scripts/delete-default-resource.sh                | 2 +-
 autogen/main/scripts/kubectl_wrapper.sh                        | 2 +-
 autogen/main/scripts/wait-for-cluster.sh                       | 2 +-
 examples/node_pool/data/shutdown-script.sh                     | 3 ++-
 examples/node_pool_update_variant/data/shutdown-script.sh      | 3 ++-
 examples/node_pool_update_variant_beta/data/shutdown-script.sh | 3 ++-
 modules/asm/scripts/install_asm.sh                             | 2 +-
 .../scripts/delete-default-resource.sh                         | 2 +-
 .../scripts/kubectl_wrapper.sh                                 | 2 +-
 .../scripts/wait-for-cluster.sh                                | 2 +-
 .../beta-private-cluster/scripts/delete-default-resource.sh    | 2 +-
 modules/beta-private-cluster/scripts/kubectl_wrapper.sh        | 2 +-
 modules/beta-private-cluster/scripts/wait-for-cluster.sh       | 2 +-
 .../scripts/delete-default-resource.sh                         | 2 +-
 .../scripts/kubectl_wrapper.sh                                 | 2 +-
 .../scripts/wait-for-cluster.sh                                | 2 +-
 modules/beta-public-cluster/scripts/delete-default-resource.sh | 2 +-
 modules/beta-public-cluster/scripts/kubectl_wrapper.sh         | 2 +-
 modules/beta-public-cluster/scripts/wait-for-cluster.sh        | 2 +-
 modules/hub/scripts/gke_hub_registration.sh                    | 2 +-
 modules/k8s-operator-crd-support/scripts/kubectl_wrapper.sh    | 2 +-
 .../k8s-operator-crd-support/scripts/wait_for_gatekeeper.sh    | 2 +-
 .../scripts/delete-default-resource.sh                         | 2 +-
 .../private-cluster-update-variant/scripts/kubectl_wrapper.sh  | 2 +-
 .../private-cluster-update-variant/scripts/wait-for-cluster.sh | 2 +-
 modules/private-cluster/scripts/delete-default-resource.sh     | 2 +-
 modules/private-cluster/scripts/kubectl_wrapper.sh             | 2 +-
 modules/private-cluster/scripts/wait-for-cluster.sh            | 2 +-
 scripts/delete-default-resource.sh                             | 2 +-
 scripts/kubectl_wrapper.sh                                     | 2 +-
 scripts/wait-for-cluster.sh                                    | 2 +-
 31 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/autogen/main/scripts/delete-default-resource.sh b/autogen/main/scripts/delete-default-resource.sh
index d31ee4be7..3c3c3b212 100755
--- a/autogen/main/scripts/delete-default-resource.sh
+++ b/autogen/main/scripts/delete-default-resource.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/autogen/main/scripts/kubectl_wrapper.sh b/autogen/main/scripts/kubectl_wrapper.sh
index e92300bcb..a65c30b58 100755
--- a/autogen/main/scripts/kubectl_wrapper.sh
+++ b/autogen/main/scripts/kubectl_wrapper.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/autogen/main/scripts/wait-for-cluster.sh b/autogen/main/scripts/wait-for-cluster.sh
index 97ee8f831..12543f336 100755
--- a/autogen/main/scripts/wait-for-cluster.sh
+++ b/autogen/main/scripts/wait-for-cluster.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/node_pool/data/shutdown-script.sh b/examples/node_pool/data/shutdown-script.sh
index f1ff19c35..7c653fb25 100644
--- a/examples/node_pool/data/shutdown-script.sh
+++ b/examples/node_pool/data/shutdown-script.sh
@@ -1,4 +1,5 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
+set -e
 
 # Copyright 2018 Google LLC
 #
diff --git a/examples/node_pool_update_variant/data/shutdown-script.sh b/examples/node_pool_update_variant/data/shutdown-script.sh
index f1ff19c35..7c653fb25 100644
--- a/examples/node_pool_update_variant/data/shutdown-script.sh
+++ b/examples/node_pool_update_variant/data/shutdown-script.sh
@@ -1,4 +1,5 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
+set -e
 
 # Copyright 2018 Google LLC
 #
diff --git a/examples/node_pool_update_variant_beta/data/shutdown-script.sh b/examples/node_pool_update_variant_beta/data/shutdown-script.sh
index f1ff19c35..7c653fb25 100644
--- a/examples/node_pool_update_variant_beta/data/shutdown-script.sh
+++ b/examples/node_pool_update_variant_beta/data/shutdown-script.sh
@@ -1,4 +1,5 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
+set -e
 
 # Copyright 2018 Google LLC
 #
diff --git a/modules/asm/scripts/install_asm.sh b/modules/asm/scripts/install_asm.sh
index 9a2ce9e22..a74e4970d 100755
--- a/modules/asm/scripts/install_asm.sh
+++ b/modules/asm/scripts/install_asm.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/modules/beta-private-cluster-update-variant/scripts/delete-default-resource.sh b/modules/beta-private-cluster-update-variant/scripts/delete-default-resource.sh
index d31ee4be7..3c3c3b212 100755
--- a/modules/beta-private-cluster-update-variant/scripts/delete-default-resource.sh
+++ b/modules/beta-private-cluster-update-variant/scripts/delete-default-resource.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/modules/beta-private-cluster-update-variant/scripts/kubectl_wrapper.sh b/modules/beta-private-cluster-update-variant/scripts/kubectl_wrapper.sh
index e92300bcb..a65c30b58 100755
--- a/modules/beta-private-cluster-update-variant/scripts/kubectl_wrapper.sh
+++ b/modules/beta-private-cluster-update-variant/scripts/kubectl_wrapper.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/modules/beta-private-cluster-update-variant/scripts/wait-for-cluster.sh b/modules/beta-private-cluster-update-variant/scripts/wait-for-cluster.sh
index 97ee8f831..12543f336 100755
--- a/modules/beta-private-cluster-update-variant/scripts/wait-for-cluster.sh
+++ b/modules/beta-private-cluster-update-variant/scripts/wait-for-cluster.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/modules/beta-private-cluster/scripts/delete-default-resource.sh b/modules/beta-private-cluster/scripts/delete-default-resource.sh
index d31ee4be7..3c3c3b212 100755
--- a/modules/beta-private-cluster/scripts/delete-default-resource.sh
+++ b/modules/beta-private-cluster/scripts/delete-default-resource.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/modules/beta-private-cluster/scripts/kubectl_wrapper.sh b/modules/beta-private-cluster/scripts/kubectl_wrapper.sh
index e92300bcb..a65c30b58 100755
--- a/modules/beta-private-cluster/scripts/kubectl_wrapper.sh
+++ b/modules/beta-private-cluster/scripts/kubectl_wrapper.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/modules/beta-private-cluster/scripts/wait-for-cluster.sh b/modules/beta-private-cluster/scripts/wait-for-cluster.sh
index 97ee8f831..12543f336 100755
--- a/modules/beta-private-cluster/scripts/wait-for-cluster.sh
+++ b/modules/beta-private-cluster/scripts/wait-for-cluster.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/modules/beta-public-cluster-update-variant/scripts/delete-default-resource.sh b/modules/beta-public-cluster-update-variant/scripts/delete-default-resource.sh
index d31ee4be7..3c3c3b212 100755
--- a/modules/beta-public-cluster-update-variant/scripts/delete-default-resource.sh
+++ b/modules/beta-public-cluster-update-variant/scripts/delete-default-resource.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/modules/beta-public-cluster-update-variant/scripts/kubectl_wrapper.sh b/modules/beta-public-cluster-update-variant/scripts/kubectl_wrapper.sh
index e92300bcb..a65c30b58 100755
--- a/modules/beta-public-cluster-update-variant/scripts/kubectl_wrapper.sh
+++ b/modules/beta-public-cluster-update-variant/scripts/kubectl_wrapper.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/modules/beta-public-cluster-update-variant/scripts/wait-for-cluster.sh b/modules/beta-public-cluster-update-variant/scripts/wait-for-cluster.sh
index 97ee8f831..12543f336 100755
--- a/modules/beta-public-cluster-update-variant/scripts/wait-for-cluster.sh
+++ b/modules/beta-public-cluster-update-variant/scripts/wait-for-cluster.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/modules/beta-public-cluster/scripts/delete-default-resource.sh b/modules/beta-public-cluster/scripts/delete-default-resource.sh
index d31ee4be7..3c3c3b212 100755
--- a/modules/beta-public-cluster/scripts/delete-default-resource.sh
+++ b/modules/beta-public-cluster/scripts/delete-default-resource.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/modules/beta-public-cluster/scripts/kubectl_wrapper.sh b/modules/beta-public-cluster/scripts/kubectl_wrapper.sh
index e92300bcb..a65c30b58 100755
--- a/modules/beta-public-cluster/scripts/kubectl_wrapper.sh
+++ b/modules/beta-public-cluster/scripts/kubectl_wrapper.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/modules/beta-public-cluster/scripts/wait-for-cluster.sh b/modules/beta-public-cluster/scripts/wait-for-cluster.sh
index 97ee8f831..12543f336 100755
--- a/modules/beta-public-cluster/scripts/wait-for-cluster.sh
+++ b/modules/beta-public-cluster/scripts/wait-for-cluster.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/modules/hub/scripts/gke_hub_registration.sh b/modules/hub/scripts/gke_hub_registration.sh
index 4a04683fd..baf2a2418 100755
--- a/modules/hub/scripts/gke_hub_registration.sh
+++ b/modules/hub/scripts/gke_hub_registration.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/modules/k8s-operator-crd-support/scripts/kubectl_wrapper.sh b/modules/k8s-operator-crd-support/scripts/kubectl_wrapper.sh
index e92300bcb..a65c30b58 100755
--- a/modules/k8s-operator-crd-support/scripts/kubectl_wrapper.sh
+++ b/modules/k8s-operator-crd-support/scripts/kubectl_wrapper.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/modules/k8s-operator-crd-support/scripts/wait_for_gatekeeper.sh b/modules/k8s-operator-crd-support/scripts/wait_for_gatekeeper.sh
index 8fde4852e..e948f7a91 100755
--- a/modules/k8s-operator-crd-support/scripts/wait_for_gatekeeper.sh
+++ b/modules/k8s-operator-crd-support/scripts/wait_for_gatekeeper.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/modules/private-cluster-update-variant/scripts/delete-default-resource.sh b/modules/private-cluster-update-variant/scripts/delete-default-resource.sh
index d31ee4be7..3c3c3b212 100755
--- a/modules/private-cluster-update-variant/scripts/delete-default-resource.sh
+++ b/modules/private-cluster-update-variant/scripts/delete-default-resource.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/modules/private-cluster-update-variant/scripts/kubectl_wrapper.sh b/modules/private-cluster-update-variant/scripts/kubectl_wrapper.sh
index e92300bcb..a65c30b58 100755
--- a/modules/private-cluster-update-variant/scripts/kubectl_wrapper.sh
+++ b/modules/private-cluster-update-variant/scripts/kubectl_wrapper.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/modules/private-cluster-update-variant/scripts/wait-for-cluster.sh b/modules/private-cluster-update-variant/scripts/wait-for-cluster.sh
index 97ee8f831..12543f336 100755
--- a/modules/private-cluster-update-variant/scripts/wait-for-cluster.sh
+++ b/modules/private-cluster-update-variant/scripts/wait-for-cluster.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/modules/private-cluster/scripts/delete-default-resource.sh b/modules/private-cluster/scripts/delete-default-resource.sh
index d31ee4be7..3c3c3b212 100755
--- a/modules/private-cluster/scripts/delete-default-resource.sh
+++ b/modules/private-cluster/scripts/delete-default-resource.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/modules/private-cluster/scripts/kubectl_wrapper.sh b/modules/private-cluster/scripts/kubectl_wrapper.sh
index e92300bcb..a65c30b58 100755
--- a/modules/private-cluster/scripts/kubectl_wrapper.sh
+++ b/modules/private-cluster/scripts/kubectl_wrapper.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/modules/private-cluster/scripts/wait-for-cluster.sh b/modules/private-cluster/scripts/wait-for-cluster.sh
index 97ee8f831..12543f336 100755
--- a/modules/private-cluster/scripts/wait-for-cluster.sh
+++ b/modules/private-cluster/scripts/wait-for-cluster.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/scripts/delete-default-resource.sh b/scripts/delete-default-resource.sh
index d31ee4be7..3c3c3b212 100755
--- a/scripts/delete-default-resource.sh
+++ b/scripts/delete-default-resource.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/scripts/kubectl_wrapper.sh b/scripts/kubectl_wrapper.sh
index e92300bcb..a65c30b58 100755
--- a/scripts/kubectl_wrapper.sh
+++ b/scripts/kubectl_wrapper.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/scripts/wait-for-cluster.sh b/scripts/wait-for-cluster.sh
index 97ee8f831..12543f336 100755
--- a/scripts/wait-for-cluster.sh
+++ b/scripts/wait-for-cluster.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");