diff options
| author | Leah Rowe <leah@libreboot.org> | 2025-04-26 19:28:49 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2025-04-26 19:28:49 +0100 |
| commit | 6779d3f9915bc4a080683c460c5988e8e2c50405 (patch) | |
| tree | 927b8dc446bccda424a57b9cfa343d52c1b58c5a | |
| parent | 848159fa0eb9502b0403073c74b27bc98c7d3001 (diff) | |
move variables out of init.sh to others
move them where they are used, or if they are used
in many places, move them to lib.sh
Signed-off-by: Leah Rowe <leah@libreboot.org>
| -rw-r--r-- | include/init.sh | 6 | ||||
| -rw-r--r-- | include/lib.sh | 5 | ||||
| -rw-r--r-- | include/rom.sh | 2 | ||||
| -rw-r--r-- | include/vendor.sh | 1 |
4 files changed, 8 insertions, 6 deletions
diff --git a/include/init.sh b/include/init.sh index b8c3cb35..2e60883d 100644 --- a/include/init.sh +++ b/include/init.sh @@ -14,12 +14,6 @@ projectsite="https://libreboot.org/" export PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games" xbmkpath="$PATH" -_ua="Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0" - -ifdtool="elf/ifdtool/default/ifdtool" -cbfstool="elf/cbfstool/default/cbfstool" -rmodtool="elf/cbfstool/default/rmodtool" -grubdata="config/data/grub" err="err_" setvars() diff --git a/include/lib.sh b/include/lib.sh index 740edcfd..01a78495 100644 --- a/include/lib.sh +++ b/include/lib.sh @@ -4,6 +4,11 @@ # Copyright (c) 2020-2025 Leah Rowe <leah@libreboot.org> # Copyright (c) 2025 Alper Nebi Yasak <alpernebiyasak@gmail.com> +_ua="Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0" + +cbfstool="elf/cbfstool/default/cbfstool" +rmodtool="elf/cbfstool/default/rmodtool" + remkdir() { rm -Rf "$1" || $err "remkdir: !rm -Rf \"$1\"" diff --git a/include/rom.sh b/include/rom.sh index b1698ee1..68c61936 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -5,6 +5,8 @@ # Copyright (c) 2022-2023 Alper Nebi Yasak <alpernebiyasak@gmail.com> # Copyright (c) 2023-2024 Riku Viitanen <riku.viitanen@protonmail.com> +grubdata="config/data/grub" + mkserprog() { [ $# -lt 1 ] && $err "mkserprog: no arguments provided" diff --git a/include/vendor.sh b/include/vendor.sh index 4ee593ea..6b316729 100644 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -16,6 +16,7 @@ vfix="DO_NOT_FLASH_YET._FIRST,_INJECT_FILES_VIA_INSTRUCTIONS_ON_LIBREBOOT.ORG_" vguide="https://libreboot.org/docs/install/ivy_has_common.html" tmpromdel="$xbmkpwd/tmp/DO_NOT_FLASH" nvm="util/nvmutil/nvm" +ifdtool="elf/ifdtool/default/ifdtool" cvchk="CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN CONFIG_KBC1126_FIRMWARE \ CONFIG_VGA_BIOS_FILE CONFIG_INCLUDE_SMSC_SCH5545_EC_FW \ |