diff options
| author | Nico Weber <thakis@chromium.org> | 2022-12-19 09:19:26 -0500 |
|---|---|---|
| committer | Tim Flynn <trflynn89@pm.me> | 2022-12-20 09:23:32 -0500 |
| commit | c6f81b5b832fa7470b4a23c4c4a6fab9dba19833 (patch) | |
| tree | dcad18df28ece46959b23317958d0b0fcc55f20f | |
| parent | 9a2ee5a9dd792359440429832ac564f5dde2b315 (diff) | |
| download | serenity-c6f81b5b832fa7470b4a23c4c4a6fab9dba19833.zip | |
Meta: Tweak shell_include.sh
* `chmod -x` as it's for sourcing, not for executing
* Remove run line, for the same reason
* Rename it from .shell_include.sh to shell_include.sh, since e.g.
`rg` doesn't search in hidden files by default
No behavior change.
| -rwxr-xr-x | Meta/build-image-extlinux.sh | 2 | ||||
| -rwxr-xr-x | Meta/build-image-grub.sh | 2 | ||||
| -rwxr-xr-x | Meta/build-image-limine.sh | 2 | ||||
| -rwxr-xr-x | Meta/build-image-qemu.sh | 2 | ||||
| -rwxr-xr-x | Meta/build-native-partition.sh | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | Meta/shell_include.sh (renamed from Meta/.shell_include.sh) | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/Meta/build-image-extlinux.sh b/Meta/build-image-extlinux.sh index 9b4dcae772..3647c67766 100755 --- a/Meta/build-image-extlinux.sh +++ b/Meta/build-image-extlinux.sh @@ -4,7 +4,7 @@ set -e script_path=$(cd -P -- "$(dirname -- "$0")" && pwd -P) -. "${script_path}/.shell_include.sh" +. "${script_path}/shell_include.sh" if [ "$(id -u)" != 0 ]; then set +e diff --git a/Meta/build-image-grub.sh b/Meta/build-image-grub.sh index 71ef767001..4b48615613 100755 --- a/Meta/build-image-grub.sh +++ b/Meta/build-image-grub.sh @@ -4,7 +4,7 @@ set -e script_path=$(cd -P -- "$(dirname -- "$0")" && pwd -P) -. "${script_path}/.shell_include.sh" +. "${script_path}/shell_include.sh" if [ "$(id -u)" != 0 ]; then set +e diff --git a/Meta/build-image-limine.sh b/Meta/build-image-limine.sh index 06ccd4d8f8..e68ee4dcf2 100755 --- a/Meta/build-image-limine.sh +++ b/Meta/build-image-limine.sh @@ -4,7 +4,7 @@ set -e script_path=$(cd -P -- "$(dirname -- "$0")" && pwd -P) -. "${script_path}/.shell_include.sh" +. "${script_path}/shell_include.sh" if [ ! -d "limine" ]; then echo "limine not found, the script will now build it" diff --git a/Meta/build-image-qemu.sh b/Meta/build-image-qemu.sh index 53a9c483ce..b7bb84ab66 100755 --- a/Meta/build-image-qemu.sh +++ b/Meta/build-image-qemu.sh @@ -3,7 +3,7 @@ set -e SCRIPT_DIR="$(dirname "${0}")" -. "${SCRIPT_DIR}/.shell_include.sh" +. "${SCRIPT_DIR}/shell_include.sh" USE_FUSE2FS=0 diff --git a/Meta/build-native-partition.sh b/Meta/build-native-partition.sh index 34237f59a3..8ebb3ba6a6 100755 --- a/Meta/build-native-partition.sh +++ b/Meta/build-native-partition.sh @@ -4,7 +4,7 @@ set -e script_path=$(cd -P -- "$(dirname -- "$0")" && pwd -P) -. "${script_path}/.shell_include.sh" +. "${script_path}/shell_include.sh" cleanup() { if [ -d mnt ]; then diff --git a/Meta/.shell_include.sh b/Meta/shell_include.sh index 17697e7250..0d95a6b880 100755..100644 --- a/Meta/.shell_include.sh +++ b/Meta/shell_include.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +# shellcheck shell=bash # shellcheck disable=SC2034 # SC2034: "Variable appears unused. Verify it or export it." # Those are intentional here, as the file is meant to be included elsewhere. |