add --syncgtk2 parameter to avoid messing with configure.ac when syncing

diff --git a/commitHelper b/commitHelper
index 2bc0cb39d86dd3cbf7a51b8bd855626e6af58f72..d1715e93bea9e348abf16850260e27b984f40f59 100644 (file)
--- a/commitHelper
+++ b/commitHelper
@@ -1,4 +1,14 @@
-#!/bin/sh
+#!/bin/bash
+if [ "$1" == "--syncgtk2" ]; then
+       shift
+       echo -n "sync with EXTRA_VERSION ? [xx] "
+       read newmicro
+       cat configure.ac | sed "s/^EXTRA_VERSION=.*/EXTRA_VERSION=$newmicro/" > configure.ac.new \
+               && mv configure.ac.new configure.ac ;   
+       cat configure.ac | sed "s/^EXTRA_GTK2_VERSION=.*/EXTRA_GTK2_VERSION=.0/" > configure.ac.new \
+               && mv configure.ac.new configure.ac ;   
+fi;
+

 head -16 configure.ac | grep VERSION= > /tmp/commitTool.tmp
 source /tmp/commitTool.tmp
 if [ -z "$EXTRA_GTK2_VERSION" ]; then
 head -16 configure.ac | grep VERSION= > /tmp/commitTool.tmp
 source /tmp/commitTool.tmp
 if [ -z "$EXTRA_GTK2_VERSION" ]; then


@@ -58,8 +68,19 @@ for line in $files; do
 "
 done;
 patchset="$patchset ) > $nextsversion.patchset"
 "
 done;
 patchset="$patchset ) > $nextsversion.patchset"

-log="$log\n"

 echo -e -n $log
 echo -e -n $log

+
+if [ "$EDITOR" == "" ]; then
+       EDITOR=vi
+fi;
+
+echo -e "\n#please type in the changelog entry" > /tmp/logentry
+$EDITOR /tmp/logentry
+grep -v "^#" /tmp/logentry |grep -v "^$" | sed "s/^/           /" > /tmp/log.tmp.$$ \
+&& mv /tmp/log.tmp.$$ /tmp/logentry
+echo >> /tmp/logentry
+cat /tmp/logentry
+

 echo "--8<----------"
 if [ -f ChangeLog-gtk2.claws ]; then
        chlog="ChangeLog-gtk2.claws"
 echo "--8<----------"
 if [ -f ChangeLog-gtk2.claws ]; then
        chlog="ChangeLog-gtk2.claws"


@@ -73,6 +94,7 @@ read ans
 if [ "$ans" == "y" ]; then
        mv $chlog $chlog.old
        echo -e -n $log > $chlog
 if [ "$ans" == "y" ]; then
        mv $chlog $chlog.old
        echo -e -n $log > $chlog

+       cat /tmp/logentry >> $chlog

        cat $chlog.old >> $chlog
        rm $chlog.old
 
        cat $chlog.old >> $chlog
        rm $chlog.old
 


@@ -85,16 +107,13 @@ if [ "$ans" == "y" ]; then
        fi;
        
        echo "$patchset" >> PATCHSETS
        fi;
        
        echo "$patchset" >> PATCHSETS

-       echo "editing $chlog ..."
-       if [ "$EDITOR" == "" ]; then
-               EDITOR=vi
-       fi;
-       $EDITOR $chlog 
+

        if [ "$@" != "" ]; then
        if [ "$@" != "" ]; then

-               echo running cvs commit $@ PATCHSETS $chlog configure.ac
-               cvs commit $@ PATCHSETS $chlog configure.ac
+               echo commiting $@ PATCHSETS $chlog configure.ac
+               cvs commit -m "`cat /tmp/logentry`" $@ PATCHSETS $chlog configure.ac

        else
        else

-               echo running cvs commit
-               cvs commit
+               echo commiting recursively
+               cvs commit -m "`cat /tmp/logentry` "

        fi;
 fi
        fi;
 fi

+rm -f /tmp/logentry