Merge pull request moby#40169 from cpuguy83/windows_version_quad_err

Windows: Only set VERSION_QUAD if unset
jessfraz · Nov 12, 2019 · 9bcbc66 · 9bcbc66
2 parents 36ffe9e + ce931f2
commit 9bcbc66
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/hack/make/.go-autogen b/hack/make/.go-autogen
@@ -57,7 +57,9 @@ if [ "$(go env GOOS)" = "windows" ]; then
 	fi
 
 	# Generate a Windows file version of the form major,minor,patch,build (with any part optional)
-	VERSION_QUAD=$(echo -n $VERSION | sed -re 's/^([0-9.]*).*$/\1/' | tr . ,)
+	if [ ! -v VERSION_QUAD ]; then
+		VERSION_QUAD=$(echo -n $VERSION | sed -re 's/^([0-9.]*).*$/\1/' | tr . ,)
+	fi
 
 	# Pass version and commit information into the resource compiler
 	defs=