2006-12-20 [wwp] 2.6.1cvs58

[claws.git] / commitHelper

diff --git a/commitHelper b/commitHelper
index 78f1b0a530b58ca39dfce7ca8f3239fa0cf81b0c..e0fae9ca1b5a73c8d1e8f9161b3243c1c89899ce 100644 (file)
--- a/commitHelper
+++ b/commitHelper
@@ -1,13 +1,14 @@
 #!/bin/bash
 args=`echo $@`
+tmpfile=${0##*/}.tmp
 
-head -n 16 configure.ac | grep VERSION= > /tmp/commitTool.tmp
-source /tmp/commitTool.tmp
+head -n 16 configure.ac | grep VERSION= > $tmpfile
+source $tmpfile
 EXTRA_VERSION=`echo $EXTRA_VERSION | awk -F'.' '{for (i=1;i<NF;i++){printf $i"."};printf $NF+1}'`
 nextsversion="${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}cvs${EXTRA_VERSION}"
 nextextra="$EXTRA_VERSION"
 nextextratype="head"
-rm /tmp/commitTool.tmp
+rm -f $tmpfile
 
 IFS='
 '
@@ -33,7 +34,16 @@ for file in $filelist; do
 done;
 patchset="("
 log=""
-files=`cvs diff -uN $@ 2>/dev/null |grep ^Index`
+files=`cvs diff -uN $@ 2>$tmpfile |grep ^Index`
+if [ "$files" == "" ]; then
+       echo Nothing to commit\!
+       if [ -s $tmpfile ]; then
+               echo See possible reason below:
+               cat $tmpfile
+       fi
+       exit
+fi
+rm -f $tmpfile
 name=`whoami`
 #change if your login isn't your name
 if [ "$name" == "claws" ]; then
@@ -69,18 +79,25 @@ for line in $files; do
        
        log="$log\t* $file\n"
        if [ "$version" != "0" ]; then
-       patchset="$patchset cvs diff -u -r $version -r $nextversion $file; "
+               patchset="$patchset cvs diff -u -r $version -r $nextversion $file; "
        else
-       patchset="$patchset diff -u /dev/null $file; "
+               patchset="$patchset diff -u /dev/null $file; "
        fi
 done;
 patchset="$patchset ) > $nextsversion.patchset"
 
-if [ "$EDITOR" == "" ]; then
-       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
 
@@ -92,14 +109,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
@@ -121,5 +133,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
+       wget -O /dev/null -o /dev/null http://www.colino.net/sylpheed-claws/update.php3
 fi