2006-01-03 [colin] 1.9.100cvs121

[claws.git] / commitHelper

diff --git a/commitHelper b/commitHelper
index b55d974c58ff93c23df4b4dd0e135640a9010da6..5833f6b165d781e6eb0a196a73ed8414d7915f84 100644 (file)
--- a/commitHelper
+++ b/commitHelper
@@ -16,7 +16,7 @@ filelist=`cvs status $@ configure.ac 2>/dev/null |grep ^File`
 for file in $filelist; do
        merge=`echo $file | grep Merge`
        modif=`echo $file | grep Locally`
-       patch=`echo $file | grep -i patch`
+       patch=`echo $file | grep Patch`
        if [ "$patch" != "" ]; then
                echo $patch 
                echo You have to update first
@@ -39,15 +39,24 @@ name=`whoami`
 if [ "$name" == "claws" ]; then
        name="paul";
 fi;
-if [ "$name" == "reboot" ]; then
-       name="christoph";
-fi;
 if [ "$name" == "leroyc" ]; then
        name="colin";
 fi;
 if [ "$name" == "torte" ]; then
        name="thorsten";
 fi;
+if [ "$name" == "dinh" ]; then
+       name="hoa";
+fi;
+if [ "$name" == "f" -o "$name" == "darkok" ]; then
+       name="darko";
+fi;
+if [ "$name" == "msp" ]; then
+       name="martin";
+fi;
+if [ "$name" == "devel" ]; then
+       name="mones";
+fi;
 
 log="`date --utc +%Y-%m-%d` [$name]\t$nextsversion\n\n"
 for line in $files; do
@@ -59,8 +68,11 @@ for line in $files; do
        nextversion=`echo $version | awk -F'.' '{for (i=1;i<NF;i++){printf $i"."};printf $NF+1}'`
        
        log="$log\t* $file\n"
-       patchset="$patchset cvs diff -u -r $version -r $nextversion $file;\
-"
+       if [ "$version" != "0" ]; then
+       patchset="$patchset cvs diff -u -r $version -r $nextversion $file; "
+       else
+       patchset="$patchset diff -u /dev/null $file; "
+       fi
 done;
 patchset="$patchset ) > $nextsversion.patchset"
 
@@ -80,14 +92,9 @@ grep -v "^#" /tmp/logentry > /tmp/log.tmp.$$ \
 echo >> /tmp/logentry
 cat /tmp/logentry
 
+chlog="ChangeLog"
+
 echo "--8<----------"
-if [ -f ChangeLog-gtk2.claws ]; then
-       chlog="ChangeLog-gtk2.claws"
-elif [ -f ChangeLog.claws ]; then
-       chlog="ChangeLog.claws"
-else
-       chlog="ChangeLog"
-fi
 echo -n "Is it ok (write to $chlog and update configure.ac) [y/N]?"
 read ans
 if [ "$ans" == "y" ]; then
@@ -109,4 +116,5 @@ if [ "$ans" == "y" ]; then
                cvs commit -m "`cat /tmp/logentry` "
        fi;
        rm -f /tmp/logentry
+       wget -O /dev/null -o /dev/null http://www.colino.net/sylpheed-claws-gtk2/update.php3
 fi