coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-11 14:02:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix lbmk shellcheck errors

Browse Source 
There was also a condition in run_make_command that is now
an OR, where it was an AND, on script/trees, to fix the use
of mixed (and erroneous) OR/AND operators.

I'm planning a much more invasive audit than this. These are
light fixes, intended for Libreboot 20241206 rev8.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2025-01-02 23:52:45 +00:00
parent 8276560cc9
commit 0cf58c2273
7 changed files with 62 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/git.sh
+7 -6
View File
@@ -2,8 +2,8 @@
# Copyright (c) 2020-2021,2023-2024 Leah Rowe <leah@libreboot.org>
# Copyright (c) 2022 Caleb La Grange <thonkpeasant@protonmail.com>
eval `setvars "" loc url bkup_url subfile subhash subrepo subrepo_bkup \
depend subfile_bkup repofail`
eval "`setvars "" loc url bkup_url subfile subhash subrepo subrepo_bkup \
depend subfile_bkup repofail`"
fetch_targets()
{
@@ -18,8 +18,8 @@ fetch_targets()
fetch_project()
{
eval `setvars "" xtree tree_depend`
eval `setcfg "config/git/$project/pkg.cfg"`
eval "`setvars "" xtree tree_depend`"
eval "`setcfg "config/git/$project/pkg.cfg"`"
chkvars url
@@ -71,7 +71,8 @@ prep_submodules()
fetch_submodule()
{
mcfgdir="$mdir/${1##*/}"
eval `setvars "" subhash subrepo subrepo_bkup subfile subfile_bkup st`
eval "`setvars "" subhash subrepo subrepo_bkup subfile subfile_bkup \
st`"
[ ! -f "$mcfgdir/module.cfg" ] || . "$mcfgdir/module.cfg" || \
$err "! . $mcfgdir/module.cfg"
@@ -103,7 +104,7 @@ tmpclone()
mkdir -p "$XBMK_CACHE/repo" || $err "!rmdir $XBMK_CACHE/repo"
if [ "$livepull" = "y" ] && [ ! -d "$repodir" ]; then
git clone $1 "$repodir" || git clone $2 "$repodir" || \
git clone "$1" "$repodir" || git clone $2 "$repodir" || \
$err "!clone $1 $2 $repodir $4 $5" #
elif [ -d "$repodir" ] && [ $# -lt 6 ]; then
git -C "$repodir" pull || sleep 3 || git -C "$repodir" pull \