2009-01-12 [wwp] 3.7.0cvs33

	* tools/fix_date.sh
	* tools/popfile-link.sh
	* tools/textviewer.sh
		Fix bashisms and other portability glitches (thanks to
		Steven M. Bellovin).

diff --git a/ChangeLog b/ChangeLog
index 50681aac7fc06c380150d2ac7e7ef6cf7964209c..185db20439b8f839dbe5a3e260d227dedec9d6ae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-12 [wwp]       3.7.0cvs33
+
+       * tools/fix_date.sh
+       * tools/popfile-link.sh
+       * tools/textviewer.sh
+               Fix bashisms and other portability glitches (thanks to
+               Steven M. Bellovin).
+
 2009-01-11 [paul]      3.7.0cvs32
 
        * src/addrindex.c

diff --git a/PATCHSETS b/PATCHSETS
index 498ae1ed78b1267d01faefd95bbf3424120cb99c..d06fd81f2c7a343207db6b0be8b0f165466aba17 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3694,3 +3694,4 @@
 ( cvs diff -u -r 1.213.2.186 -r 1.213.2.187 src/folder.c;  ) > 3.7.0cvs30.patchset
 ( cvs diff -u -r 1.28.2.39 -r 1.28.2.40 src/addrindex.c;  ) > 3.7.0cvs31.patchset
 ( cvs diff -u -r 1.28.2.40 -r 1.28.2.41 src/addrindex.c;  ) > 3.7.0cvs32.patchset
+( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 tools/fix_date.sh;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 tools/popfile-link.sh;  cvs diff -u -r 1.4.2.4 -r 1.4.2.5 tools/textviewer.sh;  ) > 3.7.0cvs33.patchset

diff --git a/configure.ac b/configure.ac
index 664e99a14e1dd4cbafbcbf91305a7667fe5c3539..94cc3e506c6275fb66d0505263853e391d7f9b02 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=32
+EXTRA_VERSION=33
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/tools/fix_date.sh b/tools/fix_date.sh
index 51f094b160265d244deb6c53f8d0b5c1a70123aa..a67a3762b33cc733c78e3167f4e5f2e1a18a5275 100644 (file)
--- a/tools/fix_date.sh
+++ b/tools/fix_date.sh
@@ -26,16 +26,16 @@
 # If no X-Original-Date already exist, the former Date value will be set
 # in such field.
 
-VERSION="0.0.4"
+VERSION="0.0.5"
 
 
-function version()
+version()
 {
        echo "$VERSION"
        exit 0
 }
 
-function usage()
+usage()
 {
        echo "usage:"
        echo "  ${0##*/} [<switches>] <filename> [<filename> ..]"
@@ -50,7 +50,7 @@ function usage()
        exit $1
 }
 
-function date_valid()
+date_valid()
 {
        test $STRICT -eq 1 && \
                REGEXP="$DATE_REGEXP_STRICT" || \

diff --git a/tools/popfile-link.sh b/tools/popfile-link.sh
index a64742432d49a1149c1e96196b64411a24a2faff..1c8bb675442110fe18baee52fe41489a887a36fa 100644 (file)
--- a/tools/popfile-link.sh
+++ b/tools/popfile-link.sh
@@ -24,7 +24,7 @@
 # the web browser set in Claws Mail prefs.
 
 
-function open_page()
+open_page()
 {
        TMPCMD=$(echo $OPEN_CMD | sed "s|\"%s\"|$1|")
        $TMPCMD &
@@ -32,7 +32,7 @@ function open_page()
 
 
 SESSION_ID=""
-if [ "$1" == "--ask-session-id" ]
+if [ "$1" = "--ask-session-id" ]
 then
        shift
        SESSION_ID=$(gxmessage -entry -center -wrap -buttons "OK:0,Cancel:1" -default "OK" \

diff --git a/tools/textviewer.sh b/tools/textviewer.sh
index 6a5c07155e8c51cf71651b244275790a0b44bd17..b9d7f4299748fc483b0ef12e784b9b5d01ab48f3 100644 (file)
--- a/tools/textviewer.sh
+++ b/tools/textviewer.sh
@@ -133,7 +133,7 @@ case "$FNAME" in
        *.xls)  TYPE=EXCEL      ;;
 esac
 
-if [ "$TYPE" == "" ]   
+if [ "$TYPE" = "" ]
 then
        case $FILETYPE in 
                *"HTML"*)       TYPE=HTML ;;