Browse code

check ID in os-release instead

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)

Jessica Frazelle authored on 2014/10/18 08:21:09
Showing 1 changed files
... ...
@@ -70,18 +70,19 @@ if [ -z "$lsb_dist" ] && [ -r /etc/lsb-release ]; then
70 70
 	lsb_dist="$(. /etc/lsb-release && echo "$DISTRIB_ID")"
71 71
 fi
72 72
 if [ -z "$lsb_dist" ] && [ -r /etc/debian_version ]; then
73
-	lsb_dist='Debian'
73
+	lsb_dist='debian'
74 74
 fi
75 75
 if [ -z "$lsb_dist" ] && [ -r /etc/fedora-release ]; then
76
-	lsb_dist='Fedora'
76
+	lsb_dist='fedora'
77 77
 fi
78 78
 if [ -z "$lsb_dist" ] && [ -r /etc/os-release ]; then
79
-	lsb_dist="$(. /etc/os-release && echo "$NAME" | cut -d' ' -f1)"
79
+	lsb_dist="$(. /etc/os-release && echo "$ID")"
80 80
 fi
81 81
 
82
+lsb_dist="$(echo "$lsb_dist" | tr '[:upper:]' '[:lower:]')"
82 83
 case "$lsb_dist" in
83
-	Amazon|Fedora)
84
-		if [ "$lsb_dist" = 'Amazon' ]; then
84
+	amzn|fedora)
85
+		if [ "$lsb_dist" = 'amzn' ]; then
85 86
 			(
86 87
 				set -x
87 88
 				$sh_c 'sleep 3; yum -y -q install docker'
... ...
@@ -111,7 +112,7 @@ case "$lsb_dist" in
111 111
 		exit 0
112 112
 		;;
113 113
 
114
-	Ubuntu|Debian|LinuxMint)
114
+	ubuntu|debian|linuxmint)
115 115
 		export DEBIAN_FRONTEND=noninteractive
116 116
 
117 117
 		did_apt_get_update=
... ...
@@ -188,7 +189,7 @@ case "$lsb_dist" in
188 188
 		exit 0
189 189
 		;;
190 190
 
191
-	Gentoo)
191
+	gentoo)
192 192
 		if [ "$url" = "https://test.docker.com/" ]; then
193 193
 			echo >&2
194 194
 			echo >&2 '  You appear to be trying to install the latest nightly build in Gentoo.'