Skip to content

Commit 218369b

Browse files
author
Jos Hickson
authored
Merge pull request #9 from wintoncode/release/1.0
Version suffix not being set correctly for release.
2 parents 6ee53dc + 72a4409 commit 218369b

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

etc/scripts/write_version_targets.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,19 @@ version_targets=$script_dir/../../Version.targets
2525

2626
file_version=$($script_dir/calculate_file_version.sh $commitish)
2727
echo "File version : $file_version"
28+
2829
assembly_version=$($script_dir/calculate_assembly_version.sh $commitish)
2930
echo "Assembly version: $assembly_version"
31+
3032
version_prefix=${file_version%%-*}
3133
echo "Version prefix : $version_prefix"
32-
version_suffix=${file_version#*-}
34+
35+
if [ "$version_prefix" == "$file_version" ]; then
36+
version_suffix="";
37+
else
38+
version_suffix=${file_version#*-};
39+
fi;
40+
3341
echo "Version suffix : $version_suffix"
3442

3543
cat > $version_targets <<EOF

0 commit comments

Comments
 (0)