From 1e818fa0aff6dec12891ee7dd739e5820fbbcc19 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Sun, 29 Jul 2018 22:33:36 -0400 Subject: [PATCH] Drop yum from tools/install_bindep.sh There is only dnf for fedora now, and since we don't test on centos we can drop yum. Change-Id: I014cf6f5fb6b9fe7745e712cd201e683379dbcf6 Signed-off-by: Paul Belanger --- tools/install_bindep.sh | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/tools/install_bindep.sh b/tools/install_bindep.sh index 283bf73..d6883c7 100755 --- a/tools/install_bindep.sh +++ b/tools/install_bindep.sh @@ -13,17 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -function is_fedora { - [ -f /usr/bin/yum ] && cat /etc/*release | grep -q -e "Fedora" -} - -YUM=yum -if is_fedora; then - YUM=dnf -fi - PACKAGES=$(bindep -b -f bindep.txt test || true) -if [ -z $PACKAGES ]; then +if [ -z "$PACKAGES" ]; then exit fi @@ -31,5 +22,5 @@ if apt-get -v > /dev/null 2>&1 ; then sudo apt-get update sudo apt-get --assume-yes install $PACKAGES else - sudo $YUM install -y $PACKAGES + sudo dnf install -y $PACKAGES fi