From e7d9dadda445b40ce50a7f4b6c208fc8060a3a0f Mon Sep 17 00:00:00 2001
From: Érico Rolim <erico.erc@gmail.com>
Date: Thu, 25 Jun 2020 21:21:23 -0300
Subject: xdbg,xls,xq,xrs: use ADDREPO from xi.

This allows the user, for example, to use `xls` to get the file list of
a nonfree package.

Closes: #185 [via git-merge-pr]
---
 xq | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'xq')

diff --git a/xq b/xq
index 8250d16..22095d2 100755
--- a/xq
+++ b/xq
@@ -6,12 +6,19 @@ totop() {
 }
 
 BRANCH=$(git symbolic-ref -q --short HEAD 2>/dev/null)
-ADDREPO="--repository=hostdir/binpkgs/$BRANCH
-	--repository=../hostdir/binpkgs/$BRANCH
-	--repository=../../hostdir/binpkgs/$BRANCH
-	--repository=hostdir/binpkgs
-	--repository=../hostdir/binpkgs
-	--repository=../../hostdir/binpkgs"
+XBPS_DISTDIR="$(xdistdir)" || XBPS_DISTDIR=.
+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
+"
 
 R=
 if [ "$1" = -R ]; then
-- 
cgit 1.4.1