about summary refs log tree commit diff
diff options
context:
space:
mode:
authorÉrico Rolim <erico.erc@gmail.com>2020-06-25 21:20:38 -0300
committerLeah Neukirchen <leah@vuxu.org>2020-06-27 00:08:30 +0200
commitdce79138b72a960c4f6b7456b0cd5461815d2397 (patch)
tree5f15f1b22f110bede1260ad3134685495a453bf1
parentcd691ecb09943f334e0890fc295fee82c2719534 (diff)
downloadxtools-dce79138b72a960c4f6b7456b0cd5461815d2397.tar.gz
xtools-dce79138b72a960c4f6b7456b0cd5461815d2397.tar.xz
xtools-dce79138b72a960c4f6b7456b0cd5461815d2397.zip
xi: use xdistdir to simplify ADDREPO definition.
-rwxr-xr-xxi41
1 files changed, 11 insertions, 30 deletions
diff --git a/xi b/xi
index d0c9a96..8bd5086 100755
--- a/xi
+++ b/xi
@@ -2,37 +2,18 @@
 # xi PKGS... - like xbps-install -S, but take cwd repo and sudo/su into account
 
 BRANCH=$(git symbolic-ref -q --short HEAD 2>/dev/null)
+XBPS_DISTDIR="$(xdistdir)" || XBPS_DISTDIR=.
 ADDREPO="
-	--repository=hostdir/binpkgs/$BRANCH
-	--repository=../hostdir/binpkgs/$BRANCH
-	--repository=../../hostdir/binpkgs/$BRANCH
-	--repository=hostdir/binpkgs/$BRANCH/nonfree
-	--repository=../hostdir/binpkgs/$BRANCH/nonfree
-	--repository=../../hostdir/binpkgs/$BRANCH/nonfree
-	--repository=hostdir/binpkgs/$BRANCH/multilib
-	--repository=../hostdir/binpkgs/$BRANCH/multilib
-	--repository=../../hostdir/binpkgs/$BRANCH/multilib
-	--repository=hostdir/binpkgs/$BRANCH/multilib/nonfree
-	--repository=../hostdir/binpkgs/$BRANCH/multilib/nonfree
-	--repository=../../hostdir/binpkgs/$BRANCH/multilib/nonfree
-	--repository=hostdir/binpkgs/$BRANCH/debug
-	--repository=../hostdir/binpkgs/$BRANCH/debug
-	--repository=../../hostdir/binpkgs/$BRANCH/debug
-	--repository=hostdir/binpkgs
-	--repository=../hostdir/binpkgs
-	--repository=../../hostdir/binpkgs
-	--repository=hostdir/binpkgs/nonfree
-	--repository=../hostdir/binpkgs/nonfree
-	--repository=../../hostdir/binpkgs/nonfree
-	--repository=hostdir/binpkgs/multilib
-	--repository=../hostdir/binpkgs/multilib
-	--repository=../../hostdir/binpkgs/multilib
-	--repository=hostdir/binpkgs/multilib/nonfree
-	--repository=../hostdir/binpkgs/multilib/nonfree
-	--repository=../../hostdir/binpkgs/multilib/nonfree
-	--repository=hostdir/binpkgs/debug
-	--repository=../hostdir/binpkgs/debug
-	--repository=../../hostdir/binpkgs/debug
+	--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
 "
 
 SUDO=