diff options
| author | Keith Packard <keithp@keithp.com> | 2008-01-10 10:56:52 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2008-01-10 10:56:52 -0800 |
| commit | 51f1536479064c2d224860c15271a9b14c87fd62 (patch) | |
| tree | ed0908a5354e92f2fd558e84772c11a49277be7b /new-version.sh | |
| parent | 554dc2e7b7e3c1cb6409d0cd786cfbea480fcf69 (diff) | |
new-version.sh was mis-editing files
Diffstat (limited to 'new-version.sh')
| -rw-r--r-- | new-version.sh | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/new-version.sh b/new-version.sh index b3f15fa7..bbc855c3 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 @@ -104,7 +101,7 @@ if [ $version != $last ]; then 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" \ @@ -117,5 +114,5 @@ $test git-tag -u 096c4dd3 -m"Version $version" $version # Make distributed change log -$test "git-log --stat $last.. > ChangeLog-$version" +git-log --stat $last.. > ChangeLog-$version |