From 0dd716d6cfb1a32f5fd5dff8ec0047df6a90dca6 Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 18 Nov 2020 05:57:43 +0100 Subject: xrs: take XBPS_HOSTDIR into account --- xrs | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/xrs b/xrs index c628a43..f633492 100755 --- a/xrs +++ b/xrs @@ -2,18 +2,23 @@ # xrs PATTERN - like xbps-query -Rs, but take cwd repo into account 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 " xbps-query $ADDREPO -Rs "$@" -- cgit 1.4.1