Skip to content

fix version quad logic that trims 0 digit so returns an empty one #3519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thaJeztah merged 1 commit into from
Mar 31, 2022
Merged

fix version quad logic that trims 0 digit so returns an empty one #3519

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions scripts/build/mkversioninfo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,19 @@ set -eu

: "${PACKAGER_NAME=}"

quadVersionNum() {
num=$(echo "${1:-0}" | cut -d. -f"$2")
if [ "$num" != "0" ]; then
echo "${num#0}"
else
echo "$num"
fi
}

. ./scripts/build/.variables

# 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_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
# Microsoft Windows Version Information and an icon using goversioninfo.
Expand All @@ -21,10 +26,10 @@ cat > ./cli/winresources/versioninfo.json <<EOL
"FixedFileInfo":
{
"FileVersion": {
"Major": ${VERSION_MAJOR},
"Minor": ${VERSION_MINOR#0},
"Patch": ${VERSION_PATCH},
"Build": ${VERSION_BUILD}
"Major": $(quadVersionNum "$VERSION_QUAD" 1),
"Minor": $(quadVersionNum "$VERSION_QUAD" 2),
"Patch": $(quadVersionNum "$VERSION_QUAD" 3),
"Build": $(quadVersionNum "$VERSION_QUAD" 4)
},
"FileFlagsMask": "3f",
"FileFlags ": "00",
Expand Down