fix bug in if with more than one arg

[claws.git] / commitHelper

diff --git a/commitHelper b/commitHelper
index d1715e93bea9e348abf16850260e27b984f40f59..3c552c8f47bb27295aa914502544ea53dde5a4c8 100644 (file)
--- a/commitHelper
+++ b/commitHelper
@@ -8,6 +8,7 @@ if [ "$1" == "--syncgtk2" ]; then
        cat configure.ac | sed "s/^EXTRA_GTK2_VERSION=.*/EXTRA_GTK2_VERSION=.0/" > configure.ac.new \
                && mv configure.ac.new configure.ac ;   
 fi;
+args=`echo $@`
 
 head -16 configure.ac | grep VERSION= > /tmp/commitTool.tmp
 source /tmp/commitTool.tmp
@@ -26,7 +27,7 @@ rm /tmp/commitTool.tmp
 
 IFS='
 '
-filelist=`cvs status $@ 2>/dev/null |grep ^File`
+filelist=`cvs status $@ configure.ac 2>/dev/null |grep ^File`
 
 for file in $filelist; do
        merge=`echo $file | grep Merge`
@@ -43,8 +44,7 @@ for file in $filelist; do
 done;
 patchset="("
 log=""
-files=`cvs diff -u $@ 2>/dev/null |grep ^Index`
-echo "--8<----------"
+files=`cvs diff -uN $@ 2>/dev/null |grep ^Index`
 name=`whoami`
 #change if your login isn't your name
 if [ "$name" == "claws" ]; then
@@ -68,14 +68,18 @@ for line in $files; do
 "
 done;
 patchset="$patchset ) > $nextsversion.patchset"
-echo -e -n $log
 
 if [ "$EDITOR" == "" ]; then
        EDITOR=vi
 fi;
 
-echo -e "\n#please type in the changelog entry" > /tmp/logentry
+if [ -n "/tmp/logentry" ]; then
+       echo -e "\n#please type in the changelog entry" > /tmp/logentry
+fi;
 $EDITOR /tmp/logentry
+
+echo "--8<----------"
+echo -e -n $log
 grep -v "^#" /tmp/logentry |grep -v "^$" | sed "s/^/           /" > /tmp/log.tmp.$$ \
 && mv /tmp/log.tmp.$$ /tmp/logentry
 echo >> /tmp/logentry
@@ -108,12 +112,12 @@ if [ "$ans" == "y" ]; then
        
        echo "$patchset" >> PATCHSETS
 
-       if [ "$@" != "" ]; then
+       if [ "$args" != "" ]; then
                echo commiting $@ PATCHSETS $chlog configure.ac
                cvs commit -m "`cat /tmp/logentry`" $@ PATCHSETS $chlog configure.ac
        else
                echo commiting recursively
                cvs commit -m "`cat /tmp/logentry` "
        fi;
+       rm -f /tmp/logentry
 fi
-rm -f /tmp/logentry