From d0c722df4e7e1fd4cd3f7e176f3530a4841225aa Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Tue, 2 Dec 2025 12:22:27 -0600 Subject: [PATCH] chore: fix provisioner scripts shebang for nix users Use `/usr/bin/env sh` --- provisioner/terraform/provision_test.go | 2 +- provisioner/terraform/testdata/fake_cancel.sh | 2 +- provisioner/terraform/testdata/fake_cancel_hang.sh | 2 +- provisioner/terraform/testdata/fake_text_file_busy.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/provisioner/terraform/provision_test.go b/provisioner/terraform/provision_test.go index 9a8a49c29b9ab..1cdcfb067b061 100644 --- a/provisioner/terraform/provision_test.go +++ b/provisioner/terraform/provision_test.go @@ -156,7 +156,7 @@ func TestProvision_Cancel(t *testing.T) { binPath := filepath.Join(dir, "terraform") // Example: exec /path/to/terrafork_fake_cancel.sh 1.2.1 apply "$@" - content := fmt.Sprintf("#!/bin/sh\nexec %q %s %s \"$@\"\n", fakeBin, terraform.TerraformVersion.String(), tt.mode) + content := fmt.Sprintf("#!/usr/bin/env sh\nexec %q %s %s \"$@\"\n", fakeBin, terraform.TerraformVersion.String(), tt.mode) err := os.WriteFile(binPath, []byte(content), 0o755) //#nosec require.NoError(t, err) t.Logf("wrote fake terraform script to %s", binPath) diff --git a/provisioner/terraform/testdata/fake_cancel.sh b/provisioner/terraform/testdata/fake_cancel.sh index 2ea713379cce9..574d25a71d88d 100755 --- a/provisioner/terraform/testdata/fake_cancel.sh +++ b/provisioner/terraform/testdata/fake_cancel.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh VERSION=$1 MODE=$2 diff --git a/provisioner/terraform/testdata/fake_cancel_hang.sh b/provisioner/terraform/testdata/fake_cancel_hang.sh index e8db67f6837cd..d1c6d4955ee1a 100755 --- a/provisioner/terraform/testdata/fake_cancel_hang.sh +++ b/provisioner/terraform/testdata/fake_cancel_hang.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh VERSION=$1 shift 1 diff --git a/provisioner/terraform/testdata/fake_text_file_busy.sh b/provisioner/terraform/testdata/fake_text_file_busy.sh index 6c9cf98f46bbe..7bf9d630540f8 100755 --- a/provisioner/terraform/testdata/fake_text_file_busy.sh +++ b/provisioner/terraform/testdata/fake_text_file_busy.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh VERSION=$1 shift 1