From 3fb36effed6cb102a73b9d2f062b917771bf193f Mon Sep 17 00:00:00 2001 From: Chris Long Date: Thu, 5 Nov 2020 22:32:03 -0800 Subject: [PATCH] Use /usr/bin/env bash instead of /bin/bash for scripts --- Azure/build_ansible_inventory.sh | 2 +- HyperV/bootstrap.sh | 2 +- Vagrant/bootstrap.sh | 2 +- Vagrant/post_build_checks.sh | 2 +- Vagrant/prepare.sh | 2 +- Vagrant/scripts/install-botsv2.sh | 2 +- Vagrant/scripts/install-botsv3.sh | 2 +- ci/build_machine_bootstrap.sh | 4 ++-- ci/manual_machine_bootstrap.sh | 2 +- ci/manual_machine_bootstrap_vmware.sh | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Azure/build_ansible_inventory.sh b/Azure/build_ansible_inventory.sh index d0ed6a0..516cdc6 100755 --- a/Azure/build_ansible_inventory.sh +++ b/Azure/build_ansible_inventory.sh @@ -1,4 +1,4 @@ -#! /bin/bash +#! /usr/bin/env bash # This script is used to populate the Azure Ansible inventory.yml with # the results of "terraform output" diff --git a/HyperV/bootstrap.sh b/HyperV/bootstrap.sh index 59476a0..738125e 100644 --- a/HyperV/bootstrap.sh +++ b/HyperV/bootstrap.sh @@ -1,4 +1,4 @@ -#! /bin/bash +#! /usr/bin/env bash # Override existing DNS Settings using netplan, but don't do it for Terraform builds if ! curl -s 169.254.169.254 --connect-timeout 2 >/dev/null; then diff --git a/Vagrant/bootstrap.sh b/Vagrant/bootstrap.sh index 24bf7f5..99c9080 100644 --- a/Vagrant/bootstrap.sh +++ b/Vagrant/bootstrap.sh @@ -1,4 +1,4 @@ -#! /bin/bash +#! /usr/bin/env bash # Override existing DNS Settings using netplan, but don't do it for Terraform builds if ! curl -s 169.254.169.254 --connect-timeout 2 >/dev/null; then diff --git a/Vagrant/post_build_checks.sh b/Vagrant/post_build_checks.sh index 6d7935b..c66280f 100755 --- a/Vagrant/post_build_checks.sh +++ b/Vagrant/post_build_checks.sh @@ -1,4 +1,4 @@ -#! /bin/bash +#! /usr/bin/env bash # This script is meant to verify that DetectionLab was built successfully. # Only MacOS and Linux are supported. Use post_build_checks.ps1 for Windows. diff --git a/Vagrant/prepare.sh b/Vagrant/prepare.sh index c90a116..090dfcd 100755 --- a/Vagrant/prepare.sh +++ b/Vagrant/prepare.sh @@ -1,4 +1,4 @@ -#! /bin/bash +#! /usr/bin/env bash # This script is meant to verify that your system is configured to # build DetectionLab successfully. diff --git a/Vagrant/scripts/install-botsv2.sh b/Vagrant/scripts/install-botsv2.sh index d0a90c6..d17c1d9 100644 --- a/Vagrant/scripts/install-botsv2.sh +++ b/Vagrant/scripts/install-botsv2.sh @@ -1,4 +1,4 @@ -#! /bin/bash +#! /usr/bin/env bash # Thanks to @MHaggis for this addition! # It is recommended to only uncomment the attack-only dataset comment block. diff --git a/Vagrant/scripts/install-botsv3.sh b/Vagrant/scripts/install-botsv3.sh index c694a6b..6081a64 100644 --- a/Vagrant/scripts/install-botsv3.sh +++ b/Vagrant/scripts/install-botsv3.sh @@ -1,4 +1,4 @@ -#! /bin/bash +#! /usr/bin/env bash #Thanks to @MHaggis for this addition! #More information on BOTSv3 can be found at https://github.com/splunk/botsv3 diff --git a/ci/build_machine_bootstrap.sh b/ci/build_machine_bootstrap.sh index 5dfbf02..40c6ed0 100755 --- a/ci/build_machine_bootstrap.sh +++ b/ci/build_machine_bootstrap.sh @@ -1,4 +1,4 @@ -#! /bin/bash +#! /usr/bin/env bash # This script is run on the Packet.net baremetal server for CI tests. # While building, the server will start a webserver on Port 80 that contains @@ -112,7 +112,7 @@ fi # Recreate a barebones version of the build script so we have some sense of return codes cat << 'EOF' > /opt/DetectionLab/build.sh -#! /bin/bash +#! /usr/bin/env bash # Brings up a single host using Vagrant vagrant_up_host() { diff --git a/ci/manual_machine_bootstrap.sh b/ci/manual_machine_bootstrap.sh index b61c2dd..266ddc4 100644 --- a/ci/manual_machine_bootstrap.sh +++ b/ci/manual_machine_bootstrap.sh @@ -1,4 +1,4 @@ -#! /bin/bash +#! /usr/bin/env bash # This script is used to manually prepare an Ubuntu 16.04 server for DetectionLab building export DEBIAN_FRONTEND=noninteractive diff --git a/ci/manual_machine_bootstrap_vmware.sh b/ci/manual_machine_bootstrap_vmware.sh index c50aeae..1daa3d3 100644 --- a/ci/manual_machine_bootstrap_vmware.sh +++ b/ci/manual_machine_bootstrap_vmware.sh @@ -1,4 +1,4 @@ -#! /bin/bash +#! /usr/bin/env bash # This script is used to manually prepare an Ubuntu 16.04 server for DetectionLab building