From b50bd587954e8467cf6141b8c86ca416e74fb26c Mon Sep 17 00:00:00 2001 From: Matthias Devlamynck Date: Sun, 4 Oct 2020 11:37:37 +0200 Subject: [PATCH 1/2] Replace #!/bin/bash with #!/usr/bin/env bash to improve compatibility with systems where /bin/bash is not available --- assets/create.sh | 2 +- tests/benchmarks/comparison.sh | 2 +- tests/benchmarks/run-benchmarks.sh | 2 +- tests/syntax-tests/regression_test.sh | 2 +- tests/syntax-tests/update.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) mode change 100644 => 100755 tests/benchmarks/comparison.sh mode change 100644 => 100755 tests/benchmarks/run-benchmarks.sh mode change 100644 => 100755 tests/syntax-tests/update.sh diff --git a/assets/create.sh b/assets/create.sh index 1a639649..a4a8aa04 100755 --- a/assets/create.sh +++ b/assets/create.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -euo pipefail ASSET_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" diff --git a/tests/benchmarks/comparison.sh b/tests/benchmarks/comparison.sh old mode 100644 new mode 100755 index 50438cf4..be188293 --- a/tests/benchmarks/comparison.sh +++ b/tests/benchmarks/comparison.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash if ! which hyperfine > /dev/null 2>&1; then echo "'hyperfine' does not seem to be installed." diff --git a/tests/benchmarks/run-benchmarks.sh b/tests/benchmarks/run-benchmarks.sh old mode 100644 new mode 100755 index 252c3008..95dd420c --- a/tests/benchmarks/run-benchmarks.sh +++ b/tests/benchmarks/run-benchmarks.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash if ! which hyperfine > /dev/null 2>&1; then echo "'hyperfine' does not seem to be installed." diff --git a/tests/syntax-tests/regression_test.sh b/tests/syntax-tests/regression_test.sh index 55e398c4..25acb256 100755 --- a/tests/syntax-tests/regression_test.sh +++ b/tests/syntax-tests/regression_test.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -eou pipefail diff --git a/tests/syntax-tests/update.sh b/tests/syntax-tests/update.sh old mode 100644 new mode 100755 index 7ce66588..beb16ffa --- a/tests/syntax-tests/update.sh +++ b/tests/syntax-tests/update.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash python="python3" if ! command -v python3 &>/dev/null; then python="python"; fi From 12340c1d10659df2f1b84a7040fa293b6b853b76 Mon Sep 17 00:00:00 2001 From: Matthias Devlamynck Date: Sun, 4 Oct 2020 12:07:22 +0200 Subject: [PATCH 2/2] Add change dir to script dir to allow running from project root dir --- tests/benchmarks/comparison.sh | 2 ++ tests/benchmarks/run-benchmarks.sh | 2 ++ tests/syntax-tests/update.sh | 2 ++ 3 files changed, 6 insertions(+) diff --git a/tests/benchmarks/comparison.sh b/tests/benchmarks/comparison.sh index be188293..c9eb5237 100755 --- a/tests/benchmarks/comparison.sh +++ b/tests/benchmarks/comparison.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +cd "$(dirname "${BASH_SOURCE[0]}")" + if ! which hyperfine > /dev/null 2>&1; then echo "'hyperfine' does not seem to be installed." echo "You can get it here: https://github.com/sharkdp/hyperfine" diff --git a/tests/benchmarks/run-benchmarks.sh b/tests/benchmarks/run-benchmarks.sh index 95dd420c..c3a15509 100755 --- a/tests/benchmarks/run-benchmarks.sh +++ b/tests/benchmarks/run-benchmarks.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +cd "$(dirname "${BASH_SOURCE[0]}")" + if ! which hyperfine > /dev/null 2>&1; then echo "'hyperfine' does not seem to be installed." echo "You can get it here: https://github.com/sharkdp/hyperfine" diff --git a/tests/syntax-tests/update.sh b/tests/syntax-tests/update.sh index beb16ffa..b4752f05 100755 --- a/tests/syntax-tests/update.sh +++ b/tests/syntax-tests/update.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +cd "$(dirname "${BASH_SOURCE[0]}")" + python="python3" if ! command -v python3 &>/dev/null; then python="python"; fi "$python" create_highlighted_versions.py -O highlighted