X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=commitHelper;h=5833f6b165d781e6eb0a196a73ed8414d7915f84;hp=c770ca566a4f18e1ee9768f783ef7a2c77fd4428;hb=225efa9e697ab4547a91d07b28b1e4c046755cbf;hpb=1092c78ef09232e0bbe7b5f8bb7c429f231e043d

diff --git a/commitHelper b/commitHelper
index c770ca566..5833f6b16 100644
--- a/commitHelper
+++ b/commitHelper
@@ -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