diff options
| -rw-r--r-- | include/get.sh (renamed from include/git.sh) | 21 | ||||
| -rw-r--r-- | include/release.sh | 4 | ||||
| -rwxr-xr-x | mk | 2 |
3 files changed, 17 insertions, 10 deletions
diff --git a/include/git.sh b/include/get.sh index af0e8f2a..9405828e 100644 --- a/include/git.sh +++ b/include/get.sh @@ -6,6 +6,7 @@ eval "`setvars "" loc url bkup_url subfile subhash subrepo subrepo_bkup \ depend subfile_bkup repofail`" tmpgit="$xbmklocal/gitclone" +tmpgitcache="$XBMK_CACHE/tmpgit" fetch_targets() { @@ -38,11 +39,10 @@ fetch_project() clone_project() { - loc="$XBMK_CACHE/repo/$project" && singletree "$project" && \ + loc="$XBMK_CACHE/clone/$project" && singletree "$project" && \ loc="src/$project" printf "Downloading project '%s' to '%s'\n" "$project" "$loc" - singletree "$project" || x_ rm -Rf "$loc" e "$loc" d missing && remkdir "${tmpgit%/*}" && git_prep \ "$url" "$bkup_url" "$xbmkpwd/config/$project/patches" "$loc"; : } @@ -139,12 +139,17 @@ try_copy() try_git() { - [ -d "$1" ] || git clone "$2" "$1" || return 1 - git -C "$1" remote add main "$4" 2>/dev/null || : - git -C "$1" remote add backup "$5" 2>/dev/null || : - git -C "$1" fetch --all || : - git -C "$1" pull --all || : - git -C "$1" pull --all || : + gitdest="`findpath "$1"`" || err "Can't get readpath for '$1'" + x_ rm -Rf "$tmpgitcache" + + [ -d "$gitdest" ] || git clone "$2" "$tmpgitcache" || return 1 + [ -d "$gitdest" ] || x_ mkdir -p "${gitdest##*/}" + [ -d "$gitdest" ] || x_ mv "$tmpgitcache" "$gitdest" + + git -C "$gitdest" remote add main "$4" 2>/dev/null || : + git -C "$gitdest" remote add backup "$5" 2>/dev/null || : + git -C "$gitdest" fetch --all || : + git -C "$gitdest" pull --all || : } bad_checksum() diff --git a/include/release.sh b/include/release.sh index fbcc5621..f0799f17 100644 --- a/include/release.sh +++ b/include/release.sh @@ -28,7 +28,9 @@ release() remkdir "$vdir" x_ git clone . "$relsrcdir" - fx_ prep_release printf "src\ntarball\nbin\n" + prep_release src + prep_release tarball + prep_release bin x_ rm -Rf "$relsrcdir" x_ mkdir -p "$reldir" @@ -17,7 +17,7 @@ fi . "include/mrc.sh" . "include/rom.sh" . "include/release.sh" -. "include/git.sh" +. "include/get.sh" main() { |