diff options
Diffstat (limited to 'include/git.sh')
| -rwxr-xr-x | include/git.sh | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/include/git.sh b/include/git.sh index e73f1ad7..b0acd7dc 100755 --- a/include/git.sh +++ b/include/git.sh @@ -2,25 +2,18 @@ # Copyright (c) 2020-2021,2023-2024 Leah Rowe <leah@libreboot.org> # Copyright (c) 2022 Caleb La Grange <thonkpeasant@protonmail.com> -eval `setvars "" rev loc url bkup_url depend tree_depend xtree mdir subhash \ - subrepo subrepo_bkup subfile subfile_bkup` +eval `setvars "" loc url bkup_url subfile mdir subhash subrepo subrepo_bkup \ + depend subfile_bkup` fetch_targets() { - [ ! -d "src/$project/$project" ] && x_ mkdir -p "src/$project" \ - && fetch_project "$project" [ -n "$tree_depend" ] && [ "$tree_depend" != "$tree" ] && \ x_ ./update trees -f "$project" "$tree_depend" - e "src/$project/$tree" d || prepare_new_tree; return 0 -} + e "src/$project/$tree" d && return 0 -prepare_new_tree() -{ printf "Creating %s tree %s\n" "$project" "$tree" - - git_prep "src/$project/$project" "src/$project/$project" \ - "$PWD/$cfgsdir/$tree/patches" "src/$project/$tree" "update" - nuke "$project/$tree" "$project/$tree" + git_prep "$loc" "$loc" "$PWD/$cfgsdir/$tree/patches" \ + "${loc%/*}/$tree" u; nuke "$project/$tree" "$project/$tree" } fetch_project() @@ -44,8 +37,7 @@ fetch_project() clone_project() { - loc="src/$project" - singletree "$project" || loc="src/$project/$project" + loc="src/$project/$project" && singletree "$project" && loc="${loc%/*}" printf "Downloading project '%s' to '%s'\n" "$project" "$loc" e "$loc" d && return 0 @@ -118,14 +110,11 @@ tmpclone() git_am_patches() { - for _patch in "$2/"*; do - [ -L "$_patch" ] || [ ! -f "$_patch" ] || git -C "$1" am \ - "$_patch" || $err "$1 $2: !git am $_patch"; continue - done - for _patches in "$2/"*; do - [ ! -L "$_patches" ] && [ -d "$_patches" ] && \ - git_am_patches "$1" "$_patches"; continue - done + for p in "$2/"*; do + [ -L "$p" ] && continue; [ -e "$p" ] || continue + [ -d "$p" ] && git_am_patches "$1" "$p" && continue + [ ! -f "$p" ] || git -C "$1" am "$p" || $err "$1 $2: !am $p" + done; return 0 } link_crossgcc() |