diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de> | 2018-02-25 11:36:46 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de> | 2018-02-25 11:36:46 +0000 |
| commit | 76f7b77b2e14f324b1f78bcf97be581a0bf670cb (patch) | |
| tree | e13abbde75d6c6afa545ce89b5e4464d1a809c22 /subr | |
| parent | 867ba92c40a584df54f1ff88094b08a4fab6d6fd (diff) | |
| download | midipix_build-76f7b77b2e14f324b1f78bcf97be581a0bf670cb.tar.bz2 midipix_build-76f7b77b2e14f324b1f78bcf97be581a0bf670cb.tar.xz | |
Fixes transient mintty build failures (via katex.)
subr/ex_rtl_fetch.subr:exp_rtl_fetch_url_git(): correctly handle Git URL branch suffixes.
Diffstat (limited to 'subr')
| -rw-r--r-- | subr/ex_rtl_fetch.subr | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/subr/ex_rtl_fetch.subr b/subr/ex_rtl_fetch.subr index 086a7954..babf267f 100644 --- a/subr/ex_rtl_fetch.subr +++ b/subr/ex_rtl_fetch.subr @@ -10,11 +10,9 @@ exp_rtl_fetch_url_git() { git pull origin "${_branch:-main}"); else git clone "${_url}" "${BUILD_DLCACHEDIR}/${_subdir}"; - if [ -n "${_branch}" -a \ - \( -z "${_branch#main}" \) -a \ - \( -z "${_branch#master}" \) ]; then - (ex_rtl_fileop cd "${BUILD_DLCACHEDIR}/${_subdir}" &&\ - git checkout -b "${_branch}"); + if [ -n "${_branch}" ]; then + (ex_rtl_fileop cd "${BUILD_DLCACHEDIR}/${_subdir}" &&\ + git checkout "${_branch}"); fi; fi; _oldpwd="${PWD}"; ex_rtl_fileop cd "${PKG_BASE_DIR}"; |