diff options
| -rwxr-xr-x | include/git.sh | 6 | ||||
| -rwxr-xr-x | script/trees | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/include/git.sh b/include/git.sh index 17333a86..2ebefc71 100755 --- a/include/git.sh +++ b/include/git.sh @@ -57,11 +57,10 @@ fetch_project_repo() [ -z "${loc+x}" ] && $err "fetch_project_repo $project: loc not set" [ -z "${url+x}" ] && $err "fetch_project_repo $project: url not set" - clone_project [ -z "$depend" ] || for d in $depend ; do x_ ./update trees -f $d done - rm -Rf "$tmpgit" || $err "fetch_repo: !rm -Rf $tmpgit" + clone_project for x in config/git/*; do [ -f "$x" ] && nuke "${x##*/}" "src/${x##*/}"; continue @@ -74,6 +73,8 @@ clone_project() loc="src/$loc" e "$loc" d && return 0 + remkdir "${tmpgit%/*}" + git clone $url "$tmpgit" || git clone $bkup_url "$tmpgit" \ || $err "clone_project: could not download $project" git_prep "$PWD/config/$project/patches" "$loc" @@ -107,7 +108,6 @@ prep_submodules() [ -n "$tree" ] && mdir="$mdir/$tree" [ -f "$mdir/module.list" ] || return 0 - cat "$mdir/module.list" > "$tmpdir/modules" || \ $err "!cp $mdir/module.list $tmpdir/modules" diff --git a/script/trees b/script/trees index 9cceeab4..faaddc5f 100755 --- a/script/trees +++ b/script/trees @@ -39,8 +39,6 @@ main() cfgsdir="config/$project" listfile="$datadir/build.list" # needed on multi, optional on single - remkdir "${tmpgit%/*}" - _cmd="build_projects" singletree "$project" || _cmd="build_targets" $_cmd $@ |