update.sh: Integrate uuid-dev logic into case statement

JayH5 · JayH5 · commit c72cd072ce5d · 2018-08-03T22:13:26.000+02:00
diff --git a/update.sh b/update.sh
@@ -165,19 +165,6 @@ for version in "${versions[@]}"; do
 			mv "$dir/Dockerfile.new" "$dir/Dockerfile"
 		fi
 
-		# https://bugs.python.org/issue11063, https://bugs.python.org/issue20519 (Python 3.7.0+)
-		# A new native _uuid module improves uuid import time and avoids using ctypes.
-		# This requires the development libuuid headers.
-		case "$version" in
-			3.4* | 3.5* | 3.6*)
-				if [[ "$v" = alpine* ]]; then
-					sed -ri -e '/util-linux-dev/d' "$dir/Dockerfile"
-				else
-					sed -ri -e '/uuid-dev/d' "$dir/Dockerfile"
-				fi
-				;;
-		esac
-
 		case "$version/$v" in
 			# https://bugs.python.org/issue32598 (Python 3.7.0b1+)
 			# TL;DR: Python 3.7+ uses OpenSSL functionality which LibreSSL 2.6.x in Alpine 3.7 doesn't implement
@@ -187,9 +174,18 @@ for version in "${versions[@]}"; do
 				;;& # (3.5*/alpine* needs to match the next block too)
 			# Libraries to build the nis module only available in Alpine 3.7+.
 			# Also require this patch https://bugs.python.org/issue32521 only available in Python 2.7, 3.6+.
-			3.4*/alpine* | 3.5*/alpine* | */alpine3.6)
+			3.[4-5]*/alpine* | */alpine3.6)
 				sed -ri -e '/libnsl-dev/d' -e '/libtirpc-dev/d' "$dir/Dockerfile"
+				;;& # (3.4*/alpine* and 3.5*/alpine* need to match the next block too)
+			# https://bugs.python.org/issue11063, https://bugs.python.org/issue20519 (Python 3.7.0+)
+			# A new native _uuid module improves uuid import time and avoids using ctypes.
+			# This requires the development libuuid headers.
+			3.[4-6]*/alpine*)
+				sed -ri -e '/util-linux-dev/d' "$dir/Dockerfile"
 				;;
+			3.[4-6]*)
+				sed -ri -e '/uuid-dev/d' "$dir/Dockerfile"
+				;;& # (other Debian variants need to match later blocks)
 			3.4/stretch*)
 				sed -ri -e 's/libssl-dev/libssl1.0-dev/g' "$dir/Dockerfile"
 				;;
