Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
| 1 | 1 |
old mode 100755 |
| 2 | 2 |
new mode 100644 |
| ... | ... |
@@ -239,10 +239,11 @@ do_install() {
|
| 239 | 239 |
if [ -z "$lsb_dist" ] && [ -r /etc/oracle-release ]; then |
| 240 | 240 |
lsb_dist='oracleserver' |
| 241 | 241 |
fi |
| 242 |
- if [ -z "$lsb_dist" ]; then |
|
| 243 |
- if [ -r /etc/centos-release ] || [ -r /etc/redhat-release ]; then |
|
| 244 |
- lsb_dist='centos' |
|
| 245 |
- fi |
|
| 242 |
+ if [ -z "$lsb_dist" ] && [ -r /etc/centos-release ]; then |
|
| 243 |
+ lsb_dist='centos' |
|
| 244 |
+ fi |
|
| 245 |
+ if [ -z "$lsb_dist" ] && [ -r /etc/redhat-release ]; then |
|
| 246 |
+ lsb_dist='redhat' |
|
| 246 | 247 |
fi |
| 247 | 248 |
if [ -z "$lsb_dist" ] && [ -r /etc/os-release ]; then |
| 248 | 249 |
lsb_dist="$(. /etc/os-release && echo "$ID")" |
| ... | ... |
@@ -279,8 +280,8 @@ do_install() {
|
| 279 | 279 |
dist_version="$(rpm -q --whatprovides redhat-release --queryformat "%{VERSION}\n" | sed 's/\/.*//' | sed 's/\..*//' | sed 's/Server*//')"
|
| 280 | 280 |
;; |
| 281 | 281 |
|
| 282 |
- fedora|centos) |
|
| 283 |
- dist_version="$(rpm -q --whatprovides redhat-release --queryformat "%{VERSION}\n" | sed 's/\/.*//' | sed 's/\..*//' | sed 's/Server*//')"
|
|
| 282 |
+ fedora|centos|redhat) |
|
| 283 |
+ dist_version="$(rpm -q --whatprovides ${lsb_dist}-release --queryformat "%{VERSION}\n" | sed 's/\/.*//' | sed 's/\..*//' | sed 's/Server*//' | sort | tail -1)"
|
|
| 284 | 284 |
;; |
| 285 | 285 |
|
| 286 | 286 |
*) |
| ... | ... |
@@ -435,7 +436,7 @@ do_install() {
|
| 435 | 435 |
exit 0 |
| 436 | 436 |
;; |
| 437 | 437 |
|
| 438 |
- fedora|centos|oraclelinux) |
|
| 438 |
+ fedora|centos|redhat|oraclelinux) |
|
| 439 | 439 |
$sh_c "cat >/etc/yum.repos.d/docker-${repo}.repo" <<-EOF
|
| 440 | 440 |
[docker-${repo}-repo]
|
| 441 | 441 |
name=Docker ${repo} Repository
|