From ce6bc8d5eb3e592b6b99fed0b79a7986a33093d0 Mon Sep 17 00:00:00 2001 From: Alesya Huzik Date: Tue, 19 Mar 2024 22:44:17 +1100 Subject: [PATCH 1/2] tools/toolbox: Use /usr/bin/env for bash /bin/bash is non-standard and in particular isn't present on NixOS. The standard way to handle scripting languages other than posix shell is via /usr/bin/env, so this change switches to using it. --- tools/toolbox/create-toolbox.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/toolbox/create-toolbox.sh b/tools/toolbox/create-toolbox.sh index c5bad3505..b2094513a 100755 --- a/tools/toolbox/create-toolbox.sh +++ b/tools/toolbox/create-toolbox.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # vi: sw=2 ts=4 set -e From 2f1c906515aeaa69f92cdd33827bbfd80794fd43 Mon Sep 17 00:00:00 2001 From: Alesya Huzik Date: Fri, 22 Mar 2024 11:16:08 +1100 Subject: [PATCH 2/2] make shebangs more compatible --- data/update-osk-layouts.sh | 2 +- subprojects/extensions-app/generate-translations.sh | 2 +- subprojects/extensions-tool/generate-translations.sh | 2 +- tools/toolbox/meson-build.sh | 2 +- tools/toolbox/meson-test.sh | 2 +- tools/toolbox/run-gnome-shell.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/update-osk-layouts.sh b/data/update-osk-layouts.sh index 8d78c0ee3..fd467fc45 100755 --- a/data/update-osk-layouts.sh +++ b/data/update-osk-layouts.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash CLDR_LAYOUTS_TARBALL="http://www.unicode.org/Public/cldr/latest/keyboards.zip" diff --git a/subprojects/extensions-app/generate-translations.sh b/subprojects/extensions-app/generate-translations.sh index 591eb7671..a4a6ac48d 100755 --- a/subprojects/extensions-app/generate-translations.sh +++ b/subprojects/extensions-app/generate-translations.sh @@ -1,4 +1,4 @@ -#!/usr/bin/bash +#!/usr/bin/env bash cd $(dirname $0) diff --git a/subprojects/extensions-tool/generate-translations.sh b/subprojects/extensions-tool/generate-translations.sh index 3521a4477..5b02743d9 100755 --- a/subprojects/extensions-tool/generate-translations.sh +++ b/subprojects/extensions-tool/generate-translations.sh @@ -1,4 +1,4 @@ -#!/usr/bin/bash +#!/usr/bin/env bash cd $(dirname $0) diff --git a/tools/toolbox/meson-build.sh b/tools/toolbox/meson-build.sh index 32ff10643..a9822e643 100755 --- a/tools/toolbox/meson-build.sh +++ b/tools/toolbox/meson-build.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/tools/toolbox/meson-test.sh b/tools/toolbox/meson-test.sh index 72631c25b..e3a736eb4 100755 --- a/tools/toolbox/meson-test.sh +++ b/tools/toolbox/meson-test.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/tools/toolbox/run-gnome-shell.sh b/tools/toolbox/run-gnome-shell.sh index 349898c77..e9a2663c0 100755 --- a/tools/toolbox/run-gnome-shell.sh +++ b/tools/toolbox/run-gnome-shell.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # vi: sw=2 ts=4 set -e