about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPiraty <piraty1@inbox.ru>2020-11-18 05:53:28 +0100
committerLeah Neukirchen <leah@vuxu.org>2020-11-18 11:18:47 +0100
commitdba0856d247454615ff3b1b4c1f24cbee6e4b3f1 (patch)
tree8af863d9352ba727f059cfccd0ff22c7787cf40e
parent508e739fed08c753ea4d486fa36d46beb21b3827 (diff)
downloadxtools-dba0856d247454615ff3b1b4c1f24cbee6e4b3f1.tar.gz
xtools-dba0856d247454615ff3b1b4c1f24cbee6e4b3f1.tar.xz
xtools-dba0856d247454615ff3b1b4c1f24cbee6e4b3f1.zip
xls: take XBPS_HOSTDIR into account
-rwxr-xr-xxls27
1 files 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