From d65e4fac1d6220f5889f13816b1c605d6a20b504 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Thu, 20 Jun 2024 01:42:10 +0100 Subject: 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 --- include/git.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 -- cgit v1.2.1