canoeboot
/
cbmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
25.04_branch
Leah Rowe 2025-04-26 19:28:49 +01:00
parent 75f6b1cc1e
commit 2c8570c07a
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/init.sh
View File

@ -14,12 +14,6 @@ projectsite="https://canoeboot.org/"
export PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games" export PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games"
xbmkpath="$PATH" 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_" err="err_"
setvars() setvars()

1
include/inject.sh
View File

@ -9,6 +9,7 @@ hashfiles="vendorhashes blobhashes" # used to detect and error out
dontflash="!!! AN ERROR OCCURED! Do NOT flash these images !!!" dontflash="!!! AN ERROR OCCURED! Do NOT flash these images !!!"
tmpromdel="$xbmkpwd/tmp/DO_NOT_FLASH" tmpromdel="$xbmkpwd/tmp/DO_NOT_FLASH"
nvm="util/nvmutil/nvm" nvm="util/nvmutil/nvm"
ifdtool="elf/ifdtool/default/ifdtool"
cv="CONFIG_GBE_BIN_PATH CONFIG_IFD_BIN_PATH" cv="CONFIG_GBE_BIN_PATH CONFIG_IFD_BIN_PATH"

5
include/lib.sh
View File

@ -4,6 +4,11 @@
# Copyright (c) 2020-2025 Leah Rowe <leah@libreboot.org> # Copyright (c) 2020-2025 Leah Rowe <leah@libreboot.org>
# Copyright (c) 2025 Alper Nebi Yasak <alpernebiyasak@gmail.com> # 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() remkdir()
{ {
rm -Rf "$1" || $err "remkdir: !rm -Rf \"$1\"" rm -Rf "$1" || $err "remkdir: !rm -Rf \"$1\""

2
include/rom.sh
View File

@ -5,6 +5,8 @@
# Copyright (c) 2022-2023 Alper Nebi Yasak <alpernebiyasak@gmail.com> # Copyright (c) 2022-2023 Alper Nebi Yasak <alpernebiyasak@gmail.com>
# Copyright (c) 2023-2024 Riku Viitanen <riku.viitanen@protonmail.com> # Copyright (c) 2023-2024 Riku Viitanen <riku.viitanen@protonmail.com>
grubdata="config/data/grub"
mkserprog() mkserprog()
{ {
[ $# -lt 1 ] && $err "mkserprog: no arguments provided" [ $# -lt 1 ] && $err "mkserprog: no arguments provided"