From fb36d6892e7fd0833f08dcab01bace3d4caec52a Mon Sep 17 00:00:00 2001 From: Malix Date: Thu, 11 Jul 2024 13:39:29 +0000 Subject: [PATCH] enhance: bash portability --- centaur/centaur.sh | 2 +- .../output_redirection/output_redirection.wdl | 2 +- cromwell.example.backends/HtCondor.conf | 2 +- docker/install.sh | 2 +- docker/run.sh | 2 +- docs/backends/HTcondor.md | 2 +- docs/tutorials/PipelinesApi101.md | 2 +- scripts/make_pr_clone_branch.sh | 2 +- scripts/reference_disks/create_images.sh | 2 +- scripts/test_upgrade/test_upgrade.sh | 2 +- src/ci/resources/acquire_b2c_token.sh | 2 +- .../backend/google/batch/runnable/Delocalization.scala | 2 +- .../backend/google/batch/runnable/RunnableCommands.scala | 2 +- .../google/pipelines/common/action/ActionCommands.scala | 2 +- .../google/pipelines/v2alpha1/api/Delocalization.scala | 2 +- .../pipelines/v2beta/src/main/resources/gcs_transfer.sh | 2 +- .../backend/google/pipelines/v2beta/api/Delocalization.scala | 2 +- .../impl/sfs/config/ConfigAsyncJobExecutionActor.scala | 2 +- .../backend/sfs/BackgroundAsyncJobExecutionActor.scala | 4 ++-- 19 files changed, 20 insertions(+), 20 deletions(-) diff --git a/centaur/centaur.sh b/centaur/centaur.sh index da077161816..e4c04b63c79 100644 --- a/centaur/centaur.sh +++ b/centaur/centaur.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash CMD='sbt' if [ -n "$1" ]; then diff --git a/centaur/src/main/resources/standardTestCases/output_redirection/output_redirection.wdl b/centaur/src/main/resources/standardTestCases/output_redirection/output_redirection.wdl index 67d396f2acd..f43de892a88 100644 --- a/centaur/src/main/resources/standardTestCases/output_redirection/output_redirection.wdl +++ b/centaur/src/main/resources/standardTestCases/output_redirection/output_redirection.wdl @@ -1,6 +1,6 @@ task output_redirection { command { - echo "#!/bin/bash" > writeToStderr.sh + echo "#!/usr/bin/env bash" > writeToStderr.sh # Yes, this is deliberate. We'll eventually end up redirecting this to stdout: echo "echo 'should be on stdout' >&2" >> writeToStderr.sh diff --git a/cromwell.example.backends/HtCondor.conf b/cromwell.example.backends/HtCondor.conf index 60dff5e01fd..45ce8de0b1b 100644 --- a/cromwell.example.backends/HtCondor.conf +++ b/cromwell.example.backends/HtCondor.conf @@ -54,7 +54,7 @@ backend { submit-docker = """ chmod 755 ${script} cat > ${cwd}/execution/dockerScript < ${cwd}/execution/dockerScript <