summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2024-06-20 01:42:10 +0100
committerLeah Rowe <leah@libreboot.org>2024-06-20 01:42:10 +0100
commitd65e4fac1d6220f5889f13816b1c605d6a20b504 (patch)
tree82b53896204f06ccb131ecd0cefcaacb93c39ae0
parentbc61c39ec8c487661676bdee32626377cd78f5a4 (diff)
git.sh: revert modification to for loop
i tried to be clever with this one, but it just made the script exit with an error. revert back to the old check (check whether one of either repo or repo backup is set) Signed-off-by: Leah Rowe <leah@libreboot.org>
-rwxr-xr-xinclude/git.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/git.sh b/include/git.sh
index 476dd2b6..e2fd2129 100755
--- a/include/git.sh
+++ b/include/git.sh
@@ -118,8 +118,10 @@ fetch_submodule()
$err "! . $mcfgdir/module.cfg"
for xt in repo file; do
- eval "[ -n \"\$sub$xt\$sub${xt}_bkup\" ] && st=\"\$st \$xt\""
+ _seval="if [ -n \"\$sub$xt\" ] || [ -n \"\$sub${xt}_bkup\" ]"
+ eval "$_seval; then st=\"\$st \$xt\"; fi"
done
+
st="${st# }" && [ "$st" = "repo file" ] && $err "$mdir: repo+file"
[ -z "$st" ] && return 0 # subrepo/subfile not defined