2011-11-19 [mones] 3.7.10cvs93

[claws.git] / commitHelper

diff --git a/commitHelper b/commitHelper
index e0fae9ca1b5a73c8d1e8f9161b3243c1c89899ce..93b2b9cbeceb083181d6391e047a9ac1f34991be 100644 (file)
--- a/commitHelper
+++ b/commitHelper
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 args=`echo $@`
 tmpfile=${0##*/}.tmp
 
@@ -67,8 +67,18 @@ fi;
 if [ "$name" == "devel" ]; then
        name="mones";
 fi;
+if [ "$name" == "hb" ]; then
+       name="holger";
+fi;
+if [ "$name" == "salvatore" ]; then
+       name="iwkse";
+fi;
+
+if [ "$name" == "corn" ]; then
+       name="pawel";
+fi;
 
-log="`date --utc +%Y-%m-%d` [$name]\t$nextsversion\n\n"
+log="`date -u +%Y-%m-%d` [$name]\t$nextsversion\n\n"
 for line in $files; do
        file=`echo $line | cut -d' ' -f2`
        dir=`dirname $file`
@@ -98,16 +108,16 @@ 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"
 
@@ -116,7 +126,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
 
@@ -127,11 +137,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/update.php3
+       rm -f /tmp/logentry.$$
+       wget -O /dev/null -o /dev/null http://www.colino.net/claws-mail/update.php
 fi