From dce79138b72a960c4f6b7456b0cd5461815d2397 Mon Sep 17 00:00:00 2001 From: Érico Rolim Date: Thu, 25 Jun 2020 21:20:38 -0300 Subject: xi: use xdistdir to simplify ADDREPO definition. --- xi | 41 +++++++++++------------------------------ 1 file 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= -- cgit 1.4.1