From e63d8dd20d99ec18ef03699516fd800a81b7f1df Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Fri, 18 Apr 2025 01:52:44 +0100 Subject: git.sh: minor cleanup Signed-off-by: Leah Rowe --- include/git.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'include/git.sh') diff --git a/include/git.sh b/include/git.sh index 4fa904ba..74942414 100644 --- a/include/git.sh +++ b/include/git.sh @@ -99,24 +99,21 @@ fetch_submodule() tmpclone() { - livepull="n" && [ "$repofail" = "y" ] && \ - printf "Cached clone failed; trying online.\n" 1>&2 && livepull="y" - - repofail="n" + eval "`setvars "n" livepull repofail`" + [ "$repofail" = "y" ] && livepull="y" [ $# -lt 6 ] || rm -Rf "$3" || $err "git retry: !rm $3 ($1)" repodir="$XBMK_CACHE/repo/${1##*/}" && [ $# -gt 5 ] && repodir="$3" mkdir -p "$XBMK_CACHE/repo" || $err "!rmdir $XBMK_CACHE/repo" if [ "$livepull" = "y" ] && [ ! -d "$repodir" ]; then - git clone "$1" "$repodir" || git clone $2 "$repodir" || \ - $err "!clone $1 $2 $repodir $4 $5" # + git clone "$1" "$repodir" || x_ git clone $2 "$repodir" elif [ -d "$repodir" ] && [ $# -lt 6 ]; then git -C "$repodir" pull || sleep 3 || git -C "$repodir" pull \ || sleep 3 || git -C "$repodir" pull || : fi ( - [ $# -gt 5 ] || git clone "$repodir" "$3" || $err "!clone $repodir $3" + [ $# -gt 5 ] || x_ git clone "$repodir" "$3" git -C "$3" reset --hard "$4" || $err "!reset $1 $2 $3 $4 $5" git_am_patches "$3" "$5" ) || repofail="y" -- cgit v1.2.1