p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch to using only the RPM command to determine the distro version.

Browse Source 
Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: a43199f14314b3d966e5723cd336f9747a0f1ca0
Component: engine
This commit is contained in:
Avi Miller
2015-07-24 07:38:28 +10:00
parent c4ddbfd5f9
commit 89bac51dfe
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/hack/install.sh
View File

@ -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