diff options
| author | Érico Rolim <erico.erc@gmail.com> | 2020-06-25 21:21:23 -0300 |
|---|---|---|
| committer | Leah Neukirchen <leah@vuxu.org> | 2020-06-27 00:08:30 +0200 |
| commit | e7d9dadda445b40ce50a7f4b6c208fc8060a3a0f (patch) | |
| tree | dbbb40039fd8e14aea2282e31457e11ea63be4f6 | |
| parent | dce79138b72a960c4f6b7456b0cd5461815d2397 (diff) | |
| download | xtools-e7d9dadda445b40ce50a7f4b6c208fc8060a3a0f.tar.gz xtools-e7d9dadda445b40ce50a7f4b6c208fc8060a3a0f.tar.xz xtools-e7d9dadda445b40ce50a7f4b6c208fc8060a3a0f.zip | |
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]
| -rwxr-xr-x | xdbg | 19 | ||||
| -rwxr-xr-x | xls | 19 | ||||
| -rwxr-xr-x | xq | 19 | ||||
| -rwxr-xr-x | xrs | 19 |
4 files changed, 52 insertions, 24 deletions
diff --git a/xdbg b/xdbg index 793da33..40079b2 100755 --- a/xdbg +++ b/xdbg @@ -2,12 +2,19 @@ # xdbg PKGS... - list debugging packages for PKGS and recursive dependencies 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 +" alldbg() { xbps-query --regex $ADDREPO -Rs '-dbg-[^-]*$' | diff --git a/xls b/xls index 344029f..8a5525e 100755 --- a/xls +++ b/xls @@ -2,12 +2,19 @@ # xls PKGS... - list files contained in PKGS (including binpkgs) 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 +" for pkg; do xbps-query $ADDREPO -f $pkg 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 diff --git a/xrs b/xrs index b82915c..348903d 100755 --- a/xrs +++ b/xrs @@ -2,11 +2,18 @@ # xrs PATTERN - like xbps-query -Rs, but take cwd repo into account 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 +" xbps-query $ADDREPO -Rs "$@" |