2008-08-09 [colin] 3.5.0cvs55

[claws.git] / commitHelper

diff --git a/commitHelper b/commitHelper
index f8496dd135970c23398f729b21dfe5483726b5ae..a73229d76f34009fce464597db583675b724d28b 100644 (file)
--- a/commitHelper
+++ b/commitHelper
@@ -67,6 +67,12 @@ fi;
 if [ "$name" == "devel" ]; then
        name="mones";
 fi;
+if [ "$name" == "hb" ]; then
+       name="holger";
+fi;
+if [ "$name" == "salvatore" ]; then
+       name="iwkse";
+fi;
 
 log="`date --utc +%Y-%m-%d` [$name]\t$nextsversion\n\n"
 for line in $files; do
@@ -86,25 +92,28 @@ for line in $files; do
 done;
 patchset="$patchset ) > $nextsversion.patchset"
 
-if [ "$EDITOR" == "" ]; then
-       if [ "$VISUAL" != "" ]; then
-               EDITOR=$VISUAL
-       else
-               EDITOR=vi
+if [ "$CVSEDITOR" == "" ]; then
+       if [ "$EDITOR" == "" ]; then
+               if [ "$VISUAL" != "" ]; then
+                       EDITOR=$VISUAL
+               else
+                       EDITOR=vi
+               fi;
        fi;
+else
+       EDITOR=$CVSEDITOR
 fi;
 
+echo -e "#please complete the changelog entry below" > /tmp/logentry.$$
+echo -e -n $log >> /tmp/logentry.$$
 
-echo -e "#please complete the changelog entry below" > /tmp/logentry
-echo -e -n $log >> /tmp/logentry
-
-$EDITOR /tmp/logentry
+$EDITOR /tmp/logentry.$$
 
 echo "--8<----------"
-grep -v "^#" /tmp/logentry > /tmp/log.tmp.$$ \
-&& mv /tmp/log.tmp.$$ /tmp/logentry
-echo >> /tmp/logentry
-cat /tmp/logentry
+grep -v "^#" /tmp/logentry.$$ > /tmp/log.tmp.$$ \
+&& mv /tmp/log.tmp.$$ /tmp/logentry.$$
+echo >> /tmp/logentry.$$
+cat /tmp/logentry.$$
 
 chlog="ChangeLog"
 
@@ -113,7 +122,7 @@ echo -n "Is it ok (write to $chlog and update configure.ac) [y/N]?"
 read ans
 if [ "$ans" == "y" ]; then
        mv $chlog $chlog.old
-       cat /tmp/logentry > $chlog
+       cat /tmp/logentry.$$ > $chlog
        cat $chlog.old >> $chlog
        rm $chlog.old
 
@@ -124,11 +133,11 @@ if [ "$ans" == "y" ]; then
 
        if [ "$args" != "" ]; then
                echo commiting $@ PATCHSETS $chlog configure.ac
-               cvs commit -m "`cat /tmp/logentry`" $@ PATCHSETS $chlog configure.ac
+               cvs commit -m "`cat /tmp/logentry.$$`" $@ PATCHSETS $chlog configure.ac
        else
                echo commiting recursively
-               cvs commit -m "`cat /tmp/logentry` "
+               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
+       rm -f /tmp/logentry.$$
+       wget -O /dev/null -o /dev/null http://www.colino.net/sylpheed-claws/update.php3
 fi