diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2017-02-03 18:07:44 +0100 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2017-02-03 18:28:30 +0100 |
| commit | bd97b660147609b31020e06ecf552d8473dfb0d3 (patch) | |
| tree | 41cc36e897e5cc64966c8910995b87e05641817f /subr/pkg_fetch.subr | |
| parent | d1adc7c60425c2b34039f713881c3cdf75534ef1 (diff) | |
| download | midipix_build-bd97b660147609b31020e06ecf552d8473dfb0d3.tar.bz2 midipix_build-bd97b660147609b31020e06ecf552d8473dfb0d3.tar.xz | |
build.sh, etc/build.usage, {subr,vars}/*: general cleanup.
Diffstat (limited to 'subr/pkg_fetch.subr')
| -rw-r--r-- | subr/pkg_fetch.subr | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/subr/pkg_fetch.subr b/subr/pkg_fetch.subr index beb76e60..f7da99fe 100644 --- a/subr/pkg_fetch.subr +++ b/subr/pkg_fetch.subr @@ -32,20 +32,22 @@ pkgp_fetch_git() { _fg_subdir="${1}"; _fg_url="${2}"; _fg_branch="${3}"; if [ ${ARG_OFFLINE:-0} -eq 0 ]; then if [ -e "${DLCACHEDIR}/${_fg_subdir}" ]; then - cd ${DLCACHEDIR}/${_fg_subdir} &&\ - git pull origin ${_fg_branch:-main} && cd ${OLDPWD}; + build_fileop cd ${DLCACHEDIR}/${_fg_subdir} &&\ + git pull origin ${_fg_branch:-main} &&\ + build_fileop cd ${OLDPWD}; else git clone ${_fg_url} ${DLCACHEDIR}/${_fg_subdir}; if [ -n "${_fg_branch}" -a \ \( -z "${_fg_branch#main}" \) -a \ \( -z "${_fg_branch#master}" \) ]; then - cd ${DLCACHEDIR}/${_fg_subdir} &&\ - git checkout -b ${_fg_branch} && cd ${OLDPWD}; + build_fileop cd ${DLCACHEDIR}/${_fg_subdir} &&\ + git checkout -b ${_fg_branch} &&\ + build_fileop cd ${OLDPWD}; fi; fi; fi; - secure_rm ${_fg_subdir}; - cp -pr ${DLCACHEDIR}/${_fg_subdir} .; + build_fileop rm ${_fg_subdir}; + build_fileop cp ${DLCACHEDIR}/${_fg_subdir} .; }; pkgp_fetch_urls_git() { |