X-Git-Url: https://git.wh0rd.org/?p=fontconfig.git;a=blobdiff_plain;f=new-version.sh;h=9ab64dd09f3043c3c326ce39538315016931842c;hp=b3f15fa7c51d94b8fd880f9e9a21c68d98f099bd;hb=HEAD;hpb=fba7c37f98658e3ee94bb454868885b7f3a8ec5e

diff --git a/new-version.sh b/new-version.sh
index b3f15fa..9ab64dd 100644
--- a/new-version.sh
+++ b/new-version.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 
-test=echo
-if git-status > /dev/null; then
-	:
-else
+if git status -a > /dev/null; then
 	echo 'Uncommited changes in repository' 1>&2
 	exit 1
 fi
@@ -24,12 +21,12 @@ eval `echo $version |
 			   
 # Update the version numbers
 
-$test sed -i configure.in "/^AM_INIT_AUTOMAKE/s/2\.[0-9.]*/$version/"
+sed -i configure.in -e "/^AM_INIT_AUTOMAKE/s/2\.[0-9.]*/$version/"
 
-$test sed -i fontconfig/fontconfig.h \
-	-e "/^#define FC_MAJOR/s/[0-9]*/$major/" \
-	-e "/^#define FC_MINOR/s/[0-9]*/$minor/" \
-	-e "/^#define FC_REVISION/s/[0-9]*/$revision/"
+sed -i fontconfig/fontconfig.h \
+	-e "/^#define FC_MAJOR/s/[0-9][0-9]*/$major/" \
+	-e "/^#define FC_MINOR/s/[0-9][0-9]*/$minor/" \
+	-e "/^#define FC_REVISION/s/[0-9][0-9]*/$revision/"
 
 #
 # Compute pretty form of new version number
@@ -73,7 +70,7 @@ if [ $version != $last ]; then
 	#
 	# header
 	#
-	(sed '/^2\.[0-9.]*$/,$d' README | 
+	(sed '/^2\.[0-9.]*/,$d' README | 
 		sed -e "s/Version.*/Version $version_note/" \
 		    -e "s/200.*/$date/" | awk '
 		    /^[ \t]/ {
@@ -95,27 +92,27 @@ if [ $version != $last ]; then
 	
 	echo $version_note
 	echo
-	git-log --pretty=short $last.. | git-shortlog | cat
+	git log --pretty=short $last.. | git shortlog | cat
 	
 	#
 	# previous changelogs
 	#
 	
-	sed -n '/^2\.[0-9.]*$/,$p' README) > README.tmp ||
+	sed -n '/^2\.[0-9.]*/,$p' README) > README.tmp ||
 		(echo "README update failed"; exit 1)
 	
-	$test mv README.tmp README
+	mv README.tmp README
 fi
 
-$test git-commit -m"Bump version to $version" \
+$test git commit -m"Bump version to $version" \
 	configure.in \
 	fontconfig/fontconfig.h \
 	README
 
 # tag the tree
-$test git-tag -u 096c4dd3 -m"Version $version" $version
+$test git tag -s -m "Version $version" $version
 
 # Make distributed change log
 
-$test "git-log --stat $last.. > ChangeLog-$version"
+git log --stat $last.. > ChangeLog-$version