瀏覽代碼

Merge pull request #8643 from jfrazelle/fix-amazon-linux-dist

Fix amazon linux dist
Tianon Gravi 10 年之前
父節點
當前提交
10d3315080
共有 1 個文件被更改,包括 20 次插入9 次删除
  1. 20 9
      hack/install.sh

+ 20 - 9
hack/install.sh

@@ -70,18 +70,29 @@ if [ -z "$lsb_dist" ] && [ -r /etc/lsb-release ]; then
 	lsb_dist="$(. /etc/lsb-release && echo "$DISTRIB_ID")"
 fi
 if [ -z "$lsb_dist" ] && [ -r /etc/debian_version ]; then
-	lsb_dist='Debian'
+	lsb_dist='debian'
 fi
 if [ -z "$lsb_dist" ] && [ -r /etc/fedora-release ]; then
-	lsb_dist='Fedora'
+	lsb_dist='fedora'
+fi
+if [ -z "$lsb_dist" ] && [ -r /etc/os-release ]; then
+	lsb_dist="$(. /etc/os-release && echo "$ID")"
 fi
 
+lsb_dist="$(echo "$lsb_dist" | tr '[:upper:]' '[:lower:]')"
 case "$lsb_dist" in
-	Fedora)
-		(
-			set -x
-			$sh_c 'sleep 3; yum -y -q install docker-io'
-		)
+	amzn|fedora)
+		if [ "$lsb_dist" = 'amzn' ]; then
+			(
+				set -x
+				$sh_c 'sleep 3; yum -y -q install docker'
+			)
+		else
+			(
+				set -x
+				$sh_c 'sleep 3; yum -y -q install docker-io'
+			)
+		fi
 		if command_exists docker && [ -e /var/run/docker.sock ]; then
 			(
 				set -x
@@ -101,7 +112,7 @@ case "$lsb_dist" in
 		exit 0
 		;;
 
-	Ubuntu|Debian|LinuxMint)
+	ubuntu|debian|linuxmint)
 		export DEBIAN_FRONTEND=noninteractive
 
 		did_apt_get_update=
@@ -178,7 +189,7 @@ case "$lsb_dist" in
 		exit 0
 		;;
 
-	Gentoo)
+	gentoo)
 		if [ "$url" = "https://test.docker.com/" ]; then
 			echo >&2
 			echo >&2 '  You appear to be trying to install the latest nightly build in Gentoo.'