diff options
author | maxice8 <thinkabit.ukim@gmail.com> | 2019-03-07 02:26:54 +0000 |
---|---|---|
committer | Michael Aldridge <aldridge.mac@gmail.com> | 2019-03-08 01:26:45 +0000 |
commit | 93a0a93ea9ff6a471f8ac852ec7f19f822a8653b (patch) | |
tree | 0d6afdd7a5cf4c817ad1a87299569084282b1975 /xbps-src | |
parent | 81e021bd8aaabd264e8f97f316537db3a2b70dab (diff) | |
download | void-packages-93a0a93ea9ff6a471f8ac852ec7f19f822a8653b.tar void-packages-93a0a93ea9ff6a471f8ac852ec7f19f822a8653b.tar.gz void-packages-93a0a93ea9ff6a471f8ac852ec7f19f822a8653b.tar.bz2 void-packages-93a0a93ea9ff6a471f8ac852ec7f19f822a8653b.tar.lz void-packages-93a0a93ea9ff6a471f8ac852ec7f19f822a8653b.tar.xz void-packages-93a0a93ea9ff6a471f8ac852ec7f19f822a8653b.tar.zst void-packages-93a0a93ea9ff6a471f8ac852ec7f19f822a8653b.zip |
xbps-src; export XBPS_GIT_CMD, defaulting to chroot-git and fallback on
git.
Diffstat (limited to 'xbps-src')
-rwxr-xr-x | xbps-src | 14 |
1 files changed, 13 insertions, 1 deletions
@@ -270,7 +270,7 @@ check_build_requirements() { if [ -n "$IN_CHROOT" ]; then _gitbranch="$(chroot-git symbolic-ref --short HEAD 2>/dev/null)" else - _gitbranch="$(git symbolic-ref --short HEAD 2>/dev/null)" + _gitbranch="$($XBPS_GIT_CMD symbolic-ref --short HEAD 2>/dev/null)" fi if [ -n "${_gitbranch}" -a "${_gitbranch}" != "master" ]; then export XBPS_ALT_REPOSITORY="${_gitbranch}" @@ -477,6 +477,18 @@ readonly REQHOST_UTILS="xbps-install xbps-query xbps-rindex xbps-uhelper \ check_reqhost_utils +# Try using chroot-git then git from the host system +if command -v chroot-git &>/dev/null; then + XBPS_GIT_CMD=$(command -v chroot-git) +elif command -v git &>/dev/null; then + XBPS_GIT_CMD=$(command -v git) +else + echo "neither chroot-git or git are available in your system!" + exit 1 +fi + +readonly XBPS_GIT_CMD + if [ -n "$IN_CHROOT" ]; then readonly XBPS_CONFIG_FILE=/etc/xbps/xbps-src.conf readonly XBPS_DISTDIR=/void-packages |