From e574f678accd55d90534b855e7e2f2df13770102 Mon Sep 17 00:00:00 2001 From: Avi Miller Date: Fri, 24 Jul 2015 07:38:28 +1000 Subject: [PATCH] From docker/docker - Switch to using only the RPM command to determine the distro version. Signed-off-by: Avi Miller --- install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index e382050..dd9df94 100755 --- a/install.sh +++ b/install.sh @@ -140,12 +140,12 @@ do_install() { fi if [ -z "$lsb_dist" ] && [ -r /etc/fedora-release ]; then lsb_dist='fedora' - dist_version="$(rpm -qa \*-release | cut -d"-" -f3 | head -n1)" + dist_version="$(rpm -q --whatprovides redhat-release --queryformat "%{VERSION\n")" fi if [ -z "$lsb_dist" ]; then if [ -r /etc/centos-release ] || [ -r /etc/redhat-release ]; then lsb_dist='centos' - dist_version="$(rpm -qa \*-release | cut -d"-" -f3 | head -n1)" + dist_version="$(rpm -q --whatprovides redhat-release --queryformat "%{VERSION}\n")" fi fi if [ -z "$lsb_dist" ] && [ -r /etc/os-release ]; then