From 421079cf380927a074457771a41b6e17da2ad2e5 Mon Sep 17 00:00:00 2001
From: Érico Rolim <erico.erc@gmail.com>
Date: Sun, 26 Jul 2020 00:22:22 -0300
Subject: xdbg,xi,xlint,xls,xq,xrs: redirect xdistdir stderr to /dev/null.

These commands were outputting error messages from xdistdir when outside
a void-packages folder, even though the command is supposed to fail silently.

Closes: #190 [via git-merge-pr]
---
 xdbg  | 2 +-
 xi    | 2 +-
 xlint | 2 +-
 xls   | 2 +-
 xq    | 2 +-
 xrs   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/xdbg b/xdbg
index 40079b2..54ad35e 100755
--- a/xdbg
+++ b/xdbg
@@ -2,7 +2,7 @@
 # xdbg PKGS... - list debugging packages for PKGS and recursive dependencies
 
 BRANCH=$(git symbolic-ref -q --short HEAD 2>/dev/null)
-XBPS_DISTDIR="$(xdistdir)" || XBPS_DISTDIR=.
+XBPS_DISTDIR="$(xdistdir 2>/dev/null)" || XBPS_DISTDIR=.
 ADDREPO="
 	--repository=$XBPS_DISTDIR/hostdir/binpkgs/$BRANCH
 	--repository=$XBPS_DISTDIR/hostdir/binpkgs/$BRANCH/nonfree
diff --git a/xi b/xi
index 8bd5086..a603c04 100755
--- a/xi
+++ b/xi
@@ -2,7 +2,7 @@
 # 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=.
+XBPS_DISTDIR="$(xdistdir 2>/dev/null)" || XBPS_DISTDIR=.
 ADDREPO="
 	--repository=$XBPS_DISTDIR/hostdir/binpkgs/$BRANCH
 	--repository=$XBPS_DISTDIR/hostdir/binpkgs/$BRANCH/nonfree
diff --git a/xlint b/xlint
index 788976e..f72a8cb 100755
--- a/xlint
+++ b/xlint
@@ -247,7 +247,7 @@ wrksrc
 xml_catalogs
 xml_entries" | tr '\n' '|')
 
-void_packages="$(xdistdir)/"
+void_packages="$(xdistdir 2>/dev/null)/"
 ret=0
 for argument; do
 	template=
diff --git a/xls b/xls
index 8a5525e..5d5052b 100755
--- a/xls
+++ b/xls
@@ -2,7 +2,7 @@
 # xls PKGS... - list files contained in PKGS (including binpkgs)
 
 BRANCH=$(git symbolic-ref -q --short HEAD 2>/dev/null)
-XBPS_DISTDIR="$(xdistdir)" || XBPS_DISTDIR=.
+XBPS_DISTDIR="$(xdistdir 2>/dev/null)" || XBPS_DISTDIR=.
 ADDREPO="
 	--repository=$XBPS_DISTDIR/hostdir/binpkgs/$BRANCH
 	--repository=$XBPS_DISTDIR/hostdir/binpkgs/$BRANCH/nonfree
diff --git a/xq b/xq
index 22095d2..94609a5 100755
--- a/xq
+++ b/xq
@@ -6,7 +6,7 @@ totop() {
 }
 
 BRANCH=$(git symbolic-ref -q --short HEAD 2>/dev/null)
-XBPS_DISTDIR="$(xdistdir)" || XBPS_DISTDIR=.
+XBPS_DISTDIR="$(xdistdir 2>/dev/null)" || XBPS_DISTDIR=.
 ADDREPO="
 	--repository=$XBPS_DISTDIR/hostdir/binpkgs/$BRANCH
 	--repository=$XBPS_DISTDIR/hostdir/binpkgs/$BRANCH/nonfree
diff --git a/xrs b/xrs
index 348903d..c628a43 100755
--- a/xrs
+++ b/xrs
@@ -2,7 +2,7 @@
 # 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)" || XBPS_DISTDIR=.
+XBPS_DISTDIR="$(xdistdir 2>/dev/null)" || XBPS_DISTDIR=.
 ADDREPO="
 	--repository=$XBPS_DISTDIR/hostdir/binpkgs/$BRANCH
 	--repository=$XBPS_DISTDIR/hostdir/binpkgs/$BRANCH/nonfree
-- 
cgit 1.4.1