1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #40169 from cpuguy83/windows_version_quad_err

Windows: Only set VERSION_QUAD if unset
This commit is contained in:
Sebastiaan van Stijn 2019-11-11 17:14:12 -08:00 committed by GitHub
commit 9bcbc66032
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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=