From 578a836d7dcc657ee92863e5315ed12754f7a3ce Mon Sep 17 00:00:00 2001
From: Sorin Sbarnea <ssbarnea@redhat.com>
Date: Wed, 4 Dec 2019 10:43:19 +0000
Subject: Improve dnf tests inside build_rpm.sh

- Fix bug failing to detect dnf in various locations
- Add missing sudo to yum/dnf calls
- Fix bug where pkg_manager may endup with a multi-line value

Signed-off-by: Sorin Sbarnea <ssbarnea@redhat.com>
---
 contrib/build_rpm.sh | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)
 mode change 100644 => 100755 contrib/build_rpm.sh

diff --git a/contrib/build_rpm.sh b/contrib/build_rpm.sh
old mode 100644
new mode 100755
index 507c03591..ceb4ca176
--- a/contrib/build_rpm.sh
+++ b/contrib/build_rpm.sh
@@ -1,15 +1,12 @@
 #!/bin/bash
 set -euxo pipefail
 
-pkg_manager=`command -v dnf`
-if [ -z "$pkg_manager" ]; then
-    pkg_manager=`command -v yum`
-fi
-
+# returned path can vary: /usr/bin/dnf /bin/dnf ...
+pkg_manager=`command -v dnf yum | head -n1`
 echo "Package manager binary: $pkg_manager"
 
 
-if [ $pkg_manager == "/usr/bin/yum" ]; then
+if [ $pkg_manager == "*yum" ]; then
     echo "[virt7-container-common-candidate]
 name=virt7-container-common-candidate
 baseurl=https://cbs.centos.org/repos/virt7-container-common-candidate/x86_64/os/
@@ -31,11 +28,11 @@ declare -a PKGS=(device-mapper-devel \
                 go-compilers-golang-compiler \
                 )
 
-if [ $pkg_manager == "/usr/bin/dnf" ]; then
+if [ $pkg_manager == "*dnf" ]; then
     PKGS+=(python3-devel \
         python3-varlink \
         )
-# btrfs-progs-devel is not available in CentOS/RHEL-8
+    # btrfs-progs-devel is not available in CentOS/RHEL-8
     if ! grep -i -q 'Red Hat\|CentOS' /etc/redhat-release; then
         PKGS+=(btrfs-progs-devel)
     fi
@@ -49,16 +46,16 @@ if [ -z "$extra_arg" ]; then
 fi
 
 echo ${PKGS[*]}
-$pkg_manager install -y ${PKGS[*]}
+sudo $pkg_manager install -y ${PKGS[*]}
 
 make -f .copr/Makefile
 rpmbuild --rebuild ${extra_arg:-""} podman-*.src.rpm
 
 # Test to make sure the install of the binary works
-$pkg_manager -y install ~/rpmbuild/RPMS/x86_64/podman-*.x86_64.rpm
+sudo $pkg_manager -y install ~/rpmbuild/RPMS/x86_64/podman-*.x86_64.rpm
 
 
 # If we built python/varlink packages, we should test their installs too
-if [ $pkg_manager == "/usr/bin/dnf" ]; then
-    $pkg_manager -y install ~/rpmbuild/RPMS/noarch/python*
+if [ $pkg_manager == "*dnf" ]; then
+    sudo $pkg_manager -y install ~/rpmbuild/RPMS/noarch/python*
 fi
-- 
cgit v1.2.3-54-g00ecf