From 89bac51dfe48eee2bcd52879b9f6729cf0525f6c Mon Sep 17 00:00:00 2001 From: Avi Miller Date: Fri, 24 Jul 2015 07:38:28 +1000 Subject: [PATCH 1/2] Switch to using only the RPM command to determine the distro version. Signed-off-by: Avi Miller Upstream-commit: a43199f14314b3d966e5723cd336f9747a0f1ca0 Component: engine --- components/engine/hack/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/hack/install.sh b/components/engine/hack/install.sh index e3820503e2..dd9df94a2a 100755 --- a/components/engine/hack/install.sh +++ b/components/engine/hack/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 From 219631f054480cd169ea0a3faaf610dced6c2fbc Mon Sep 17 00:00:00 2001 From: Avi Miller Date: Fri, 24 Jul 2015 08:14:06 +1000 Subject: [PATCH 2/2] Fix typo. Signed-off-by: Avi Miller Upstream-commit: 59e48b346848a131d85a808fa1e21aea8c4f9833 Component: engine --- components/engine/hack/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/hack/install.sh b/components/engine/hack/install.sh index dd9df94a2a..bbe9f70ede 100755 --- a/components/engine/hack/install.sh +++ b/components/engine/hack/install.sh @@ -140,7 +140,7 @@ do_install() { fi if [ -z "$lsb_dist" ] && [ -r /etc/fedora-release ]; then lsb_dist='fedora' - dist_version="$(rpm -q --whatprovides redhat-release --queryformat "%{VERSION\n")" + 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