2005-10-03 [paul] 1.9.14cvs68

[claws.git] / commitHelper

diff --git a/commitHelper b/commitHelper
index 4da0b4d8260f5d5942e8ae36741353ade0569392..667bc60f619463f6ae6beb1d19852f6a06dc14ce 100644 (file)
--- a/commitHelper
+++ b/commitHelper
@@ -16,9 +16,14 @@ 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`
-       if [ "$merge" != "" || "$patch" != "" ]; then
-               echo $merge $patch
+       patch=`echo $file | grep Patch`
+       if [ "$patch" != "" ]; then
+               echo $patch 
+               echo You have to update first
+               exit
+       fi;
+       if [ "$merge" != "" ]; then
+               echo $merge 
                echo You have to update first
                exit
        fi;
@@ -43,6 +48,15 @@ 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;
 
 log="`date --utc +%Y-%m-%d` [$name]\t$nextsversion\n\n"
 for line in $files; do
@@ -54,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"
 
@@ -104,4 +121,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