From da4272720958f639227c7594018f840d1f693920 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Wed, 22 May 2024 23:11:12 +0100 Subject: [PATCH] git.sh: move repo copying to a new function Signed-off-by: Leah Rowe --- include/git.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/include/git.sh b/include/git.sh index e7dfe591..569daeab 100755 --- a/include/git.sh +++ b/include/git.sh @@ -100,10 +100,7 @@ git_prep() [ "$xbmk_release" = "y" ] && [ "$_loc" != "src/$project/$project" ] \ && rmgit "$tmpgit" - [ "$_loc" = "${_loc%/*}" ] || x_ mkdir -p "${_loc%/*}" - mv "$tmpgit" "$_loc" || $err "git_prep: !mv $tmpgit $_loc" - [ -n "$xtree" ] && [ ! -d "src/coreboot/$xtree" ] && \ - x_ ./update trees -f coreboot "$xtree"; return 0 + move_repo "$_loc" } prep_submodules() @@ -142,3 +139,11 @@ link_crossgcc() ln -s "../../$xtree/util/crossgcc" crossgcc || $err "$1: !xgcc link" ) || $err "$1: !xgcc link" } + +move_repo() +{ + [ "$1" = "${1%/*}" ] || x_ mkdir -p "${1%/*}" + mv "$tmpgit" "$1" || $err "git_prep: !mv $tmpgit $1" + [ -n "$xtree" ] && [ ! -d "src/coreboot/$xtree" ] && \ + x_ ./update trees -f coreboot "$xtree"; return 0 +}