From dba0856d247454615ff3b1b4c1f24cbee6e4b3f1 Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 18 Nov 2020 05:53:28 +0100 Subject: xls: take XBPS_HOSTDIR into account --- xls | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/xls b/xls index 5d5052b..3fdd090 100755 --- a/xls +++ b/xls @@ -2,18 +2,23 @@ # xls PKGS... - list files contained in PKGS (including binpkgs) BRANCH=$(git symbolic-ref -q --short HEAD 2>/dev/null) -XBPS_DISTDIR="$(xdistdir 2>/dev/null)" || XBPS_DISTDIR=. +if [ -n "$XBPS_HOSTDIR" ]; then + XBPS_BINPKGS="$XBPS_HOSTDIR/binpkgs" +else + XBPS_DISTDIR="$(xdistdir 2>/dev/null)" || XBPS_DISTDIR=. + XBPS_BINPKGS="$XBPS_DISTDIR/hostdir/binpkgs" +fi ADDREPO=" - --repository=$XBPS_DISTDIR/hostdir/binpkgs/$BRANCH - --repository=$XBPS_DISTDIR/hostdir/binpkgs/$BRANCH/nonfree - --repository=$XBPS_DISTDIR/hostdir/binpkgs/$BRANCH/multilib - --repository=$XBPS_DISTDIR/hostdir/binpkgs/$BRANCH/multilib/nonfree - --repository=$XBPS_DISTDIR/hostdir/binpkgs/$BRANCH/debug - --repository=$XBPS_DISTDIR/hostdir/binpkgs - --repository=$XBPS_DISTDIR/hostdir/binpkgs/nonfree - --repository=$XBPS_DISTDIR/hostdir/binpkgs/multilib - --repository=$XBPS_DISTDIR/hostdir/binpkgs/multilib/nonfree - --repository=$XBPS_DISTDIR/hostdir/binpkgs/debug + --repository=$XBPS_BINPKGS/$BRANCH + --repository=$XBPS_BINPKGS/$BRANCH/nonfree + --repository=$XBPS_BINPKGS/$BRANCH/multilib + --repository=$XBPS_BINPKGS/$BRANCH/multilib/nonfree + --repository=$XBPS_BINPKGS/$BRANCH/debug + --repository=$XBPS_BINPKGS + --repository=$XBPS_BINPKGS/nonfree + --repository=$XBPS_BINPKGS/multilib + --repository=$XBPS_BINPKGS/multilib/nonfree + --repository=$XBPS_BINPKGS/debug " for pkg; do -- cgit 1.4.1