diff options
Diffstat (limited to 'include/git.sh')
| -rwxr-xr-x | include/git.sh | 50 |
1 files changed, 21 insertions, 29 deletions
diff --git a/include/git.sh b/include/git.sh index 7f926c28..ce7a2625 100755 --- a/include/git.sh +++ b/include/git.sh @@ -4,8 +4,7 @@ # This file is only used by update/project/trees -eval "$(setvars "" _target rev _xm)" -eval "$(setvars "" loc url bkup_url depend)" +eval "$(setvars "" _target rev _xm loc url bkup_url depend)" tmp_git_dir="${PWD}/tmp/gitclone" fetch_project_trees() @@ -16,8 +15,7 @@ fetch_project_trees() [ -z "${rev}" ] && err "fetch_project_trees $target: undefined rev" [ -d "src/${project}/${tree}" ] && \ printf "download/%s %s (%s): exists\n" \ - "${project}" "${tree}" "${_target}" 1>&2 && \ - return 1 + "${project}" "${tree}" "${_target}" 1>&2 && return 0 prepare_new_tree } @@ -26,12 +24,12 @@ fetch_from_upstream() [ -d "src/${project}/${project}" ] && return 0 x_ mkdir -p "src/${project}" - x_ fetch_project_repo "${project}" + fetch_project_repo "${project}" } fetch_config() { - x_ rm -f "${cfgsdir}/"*/seen + rm -f "${cfgsdir}/"*/seen || err "fetch_config ${cfgsdir}: !rm seen" while true; do eval "$(setvars "" rev tree)" _xm="fetch_config ${project}/${_target}" @@ -51,7 +49,7 @@ load_target_config() . "${cfgsdir}/${1}/target.cfg" || \ err "load_target_config ${cfgsdir}/${1}: cannot load config" - x_ touch "${cfgsdir}/${1}/seen" + touch "${cfgsdir}/${1}/seen" || err "load_config $cfgsdir/$1: !mk seen" } prepare_new_tree() @@ -59,14 +57,13 @@ prepare_new_tree() printf "Creating %s tree %s (%s)\n" "${project}" "${tree}" "${_target}" x_ cp -R "src/${project}/${project}" "src/${project}/${tree}" - x_ git_reset_rev "src/${project}/${tree}" "${rev}" + git_reset_rev "src/${project}/${tree}" "${rev}" ( x_ cd "src/${project}/${tree}" git submodule update --init --checkout || \ err "prepare_new_tree ${project}/${tree}: can't update git modules" ) - git_am_patches "${PWD}/src/${project}/${tree}" \ - "${PWD}/${cfgsdir}/${tree}/patches" + git_am_patches "$PWD/src/$project/$tree" "$PWD/$cfgsdir/$tree/patches" } fetch_project_repo() @@ -75,10 +72,10 @@ fetch_project_repo() verify_config clone_project - [ "${depend}" = "" ] || for d in ${depend} ; do - x_ ./update project trees -f ${d} + [ -z "${depend}" ] || for d in ${depend} ; do + x_ ./update trees -f ${d} done - x_ rm -Rf "${tmp_git_dir}" + rm -Rf "${tmp_git_dir}" || err "fetch_repo: !rm -Rf ${tmp_git_dir}" } verify_config() @@ -91,8 +88,9 @@ verify_config() clone_project() { - x_ rm -Rf "${tmp_git_dir}" - x_ mkdir -p "${tmp_git_dir%/*}" + rm -Rf "${tmp_git_dir}" || err "clone_project: !rm -Rf ${tmp_git_dir}" + mkdir -p "${tmp_git_dir%/*}" || \ + err "clone_project: !mkdir -p ${tmp_git_dir%/*}" loc="${loc#src/}" loc="src/${loc}" @@ -100,24 +98,20 @@ clone_project() git clone ${url} "${tmp_git_dir}" || \ git clone ${bkup_url} "${tmp_git_dir}" || \ err "clone_project: could not download ${project}" - git_reset_rev "${tmp_git_dir}" "${rev}" || \ - err "clone_project ${loc}/: cannot reset <- ${rev}" - git_am_patches "${tmp_git_dir}" "${PWD}/config/${project}/patches" || \ - err "clone_project ${loc}/: cannot apply patches" + git_reset_rev "${tmp_git_dir}" "${rev}" + git_am_patches "${tmp_git_dir}" "${PWD}/config/${project}/patches" x_ rm -Rf "${loc}" [ "${loc}" = "${loc%/*}" ] || x_ mkdir -p ${loc%/*} - x_ mv "${tmp_git_dir}" "${loc}" + mv "${tmp_git_dir}" "${loc}" || \ + err "clone_project: !mv ${tmp_git_dir} ${loc}" } git_reset_rev() { - sdir="${1}" - _rev="${2}" ( - x_ cd "${sdir}" - git reset --hard ${_rev} || \ - err "cannot git reset ${sdir} <- ${rev}" + cd "${1}" || err "git_reset_rev: !cd ${1}" + git reset --hard ${2} || err "!git reset ${1} <- ${2}" ) } @@ -126,7 +120,7 @@ git_am_patches() sdir="${1}" # assumed to be absolute path patchdir="${2}" # ditto ( - x_ cd "${sdir}" + cd "${sdir}" || err "git_am_patches: !cd ${sdir}" for patch in "${patchdir}/"*; do [ -L "${patch}" ] && continue [ -f "${patch}" ] || continue @@ -138,8 +132,6 @@ git_am_patches() ) for patches in "${patchdir}/"*; do [ -L "${patches}" ] && continue - [ ! -d "${patches}" ] || \ - git_am_patches "${sdir}" "${patches}" err || \ - err "apply_patches: !${sdir}/ ${patches}/" + [ -d "${patches}" ] && git_am_patches "${sdir}" "${patches}" done } |