Skip to content

Commit 453995e

Browse files
committed
Fix version check for NuGet files.
1 parent df1bdb0 commit 453995e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

scripts/makesrcdist

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,19 +72,19 @@ else
7272
fi
7373

7474
semversion="$(echo $version | sed -E -e '1,$s/^([0-9]\.[0-9]+)([a-z1-9]+)$/\1.0-\2/')"
75-
temp="$(grep '<version>' vcnet/libcups3_native.nuspec | sed -e '1,$s/^[ \t]*<version>//' -e '1,$s/<\/version>$//')"
75+
temp="$(grep '<version>' vcnet/libcups3_native.nuspec | sed -e '1,$s/^[ \t]*<version>//' -e '1,$s/<\/version>$//' | awk -F. '{print $1 "." $2 "." $3}')"
7676
if test "v$temp" != "v$semversion"; then
7777
echo "Still need to update <version> to $semversion in vcnet/libcups3_native.nuspec (saw $temp)"
7878
exit 1
7979
fi
8080

81-
temp="$(grep 'libcups3_native.redist' vcnet/libcups3_native.nuspec | awk -F\" '{print $4}')"
81+
temp="$(grep 'libcups3_native.redist' vcnet/libcups3_native.nuspec | awk -F\" '{print $4}' | awk -F. '{print $1 "." $2 "." $3}')"
8282
if test "v$temp" != "v$semversion"; then
8383
echo "Still need to update libcups3_native.redist version to $semversion in vcnet/libcups3_native.nuspec (saw $temp)"
8484
exit 1
8585
fi
8686

87-
temp="$(grep '<version>' vcnet/libcups3_native.redist.nuspec | sed -e '1,$s/^[ \t]*<version>//' -e '1,$s/<\/version>$//')"
87+
temp="$(grep '<version>' vcnet/libcups3_native.redist.nuspec | sed -e '1,$s/^[ \t]*<version>//' -e '1,$s/<\/version>$//' | awk -F. '{print $1 "." $2 "." $3}')"
8888
if test "v$temp" != "v$semversion"; then
8989
echo "Still need to update <version> to $semversion in vcnet/libcups3_native.redist.nuspec (saw $temp)"
9090
exit 1

0 commit comments

Comments
 (0)