Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3517 from crazy-max/fix-version-quad 

trim leading 0 for minor in the version quad
This commit is contained in:
Sebastiaan van Stijn 2022-03-31 16:10:22 +02:00 committed by GitHub
parent 58d425d3bf 525845572a
commit b1ce915a3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/build/mkversioninfo
View File

@ -7,6 +7,10 @@ set -eu
# Create version quad for Windows of the form major.minor.patch.build # Create version quad for Windows of the form major.minor.patch.build
VERSION_QUAD=$(printf "%s" "$VERSION" | sed -re 's/^([0-9.]*).*$/\1/' | sed -re 's/\.$//' | sed -re 's/^[0-9]+$/\0\.0/' | sed -re 's/^[0-9]+\.[0-9]+$/\0\.0/' | sed -re 's/^[0-9]+\.[0-9]+\.[0-9]+$/\0\.0/') VERSION_QUAD=$(printf "%s" "$VERSION" | sed -re 's/^([0-9.]*).*$/\1/' | sed -re 's/\.$//' | sed -re 's/^[0-9]+$/\0\.0/' | sed -re 's/^[0-9]+\.[0-9]+$/\0\.0/' | sed -re 's/^[0-9]+\.[0-9]+\.[0-9]+$/\0\.0/')
VERSION_MAJOR=$(echo "${VERSION_QUAD:-0}" | cut -d. -f1)
VERSION_MINOR=$(echo "${VERSION_QUAD:-0}" | cut -d. -f2)
VERSION_PATCH=$(echo "${VERSION_QUAD:-0}" | cut -d. -f3)
VERSION_BUILD=$(echo "${VERSION_QUAD:-0}" | cut -d. -f4)
# Generate versioninfo.json to be able to create a syso file which contains # Generate versioninfo.json to be able to create a syso file which contains
# Microsoft Windows Version Information and an icon using goversioninfo. # Microsoft Windows Version Information and an icon using goversioninfo.
@ -17,10 +21,10 @@ cat > ./cli/winresources/versioninfo.json <<EOL
"FixedFileInfo": "FixedFileInfo":
{ {
"FileVersion": { "FileVersion": {
"Major": $(echo "${VERSION_QUAD:-0}" | cut -d. -f1), "Major": ${VERSION_MAJOR},
"Minor": $(echo "${VERSION_QUAD:-0}" | cut -d. -f2), "Minor": ${VERSION_MINOR#0},
"Patch": $(echo "${VERSION_QUAD:-0}" | cut -d. -f3), "Patch": ${VERSION_PATCH},
"Build": $(echo "${VERSION_QUAD:-0}" | cut -d. -f4) "Build": ${VERSION_BUILD}
}, },
"FileFlagsMask": "3f", "FileFlagsMask": "3f",
"FileFlags ": "00", "FileFlags ": "00",