From 5e4009b539b0c1bbb14eea8f8cd892d3933c3355 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 6 May 2024 22:54:55 +0100 Subject: merge include/err.sh with include/option.sh Signed-off-by: Leah Rowe --- script/build/roms | 1 - script/build/serprog | 2 +- script/update/release | 1 - script/update/trees | 1 - script/vendor/download | 1 - script/vendor/inject | 1 - 6 files changed, 1 insertion(+), 6 deletions(-) (limited to 'script') diff --git a/script/build/roms b/script/build/roms index 032c0a57..6049848f 100755 --- a/script/build/roms +++ b/script/build/roms @@ -8,7 +8,6 @@ set -u -e -. "include/err.sh" . "include/option.sh" seavgabiosrom="elf/seabios/default/libgfxinit/vgabios.bin" diff --git a/script/build/serprog b/script/build/serprog index ea2c02bf..b830f26d 100755 --- a/script/build/serprog +++ b/script/build/serprog @@ -5,7 +5,7 @@ set -u -e -. "include/err.sh" +. "include/option.sh" eval "$(setvars "" pico_sdk_dir pico_src_dir stm32_src_dir boards_dir)" diff --git a/script/update/release b/script/update/release index 405fdc28..aebe6fbf 100755 --- a/script/update/release +++ b/script/update/release @@ -4,7 +4,6 @@ set -u -e -. "include/err.sh" . "include/option.sh" eval "$(setvars "" vdir relname src_dirname srcdir _xm target romdir mode)" diff --git a/script/update/trees b/script/update/trees index af80d99a..615fbbf2 100755 --- a/script/update/trees +++ b/script/update/trees @@ -6,7 +6,6 @@ set -u -e -. "include/err.sh" . "include/option.sh" . "include/git.sh" diff --git a/script/vendor/download b/script/vendor/download index b40810cc..6f1fdbbf 100755 --- a/script/vendor/download +++ b/script/vendor/download @@ -4,7 +4,6 @@ # SPDX-FileCopyrightText: 2022 Ferass El Hafidi # SPDX-FileCopyrightText: 2023-2024 Leah Rowe -. "include/err.sh" . "include/option.sh" . "include/mrc.sh" diff --git a/script/vendor/inject b/script/vendor/inject index dc12d7b5..9b6b52ea 100755 --- a/script/vendor/inject +++ b/script/vendor/inject @@ -4,7 +4,6 @@ # SPDX-FileCopyrightText: 2022 Ferass El Hafidi # SPDX-FileCopyrightText: 2023-2024 Leah Rowe -. "include/err.sh" . "include/option.sh" nvmutil="util/nvmutil/nvm" -- cgit v1.2.1