add --use-claws-version and set it as global

diff --git a/ChangeLog b/ChangeLog
index d8f5702e54ddf91172d80d85ecf623d3e9f1c4aa..927424f46ffb20cb8aa3c961340ae84a1e567f8d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-12 12:53  mones   0.5.0svn209
+
+       * clawsker
+               Get claws-mail version as global
+               Add undocumented option to set it manually
+
 2008-11-24 07:23  mones   0.5.0svn207
 
        * clawsker

diff --git a/VERSION b/VERSION
index 776fe231c1e69566c4eaea0e3297c2356e8c4426..85a59dfa5e4641e55702ca26c3343034eb0cdda1 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.5.0svn207
+0.5.0svn209

diff --git a/clawsker b/clawsker
index b2125e5a9e05cf7447abd38373bb066870aa2376..06ff51e789ef175a89e4315e0b794e947702f3ea 100755 (executable)
--- a/clawsker
+++ b/clawsker
@@ -88,6 +88,7 @@ my $PREFIX = '@PREFIX@';
 my $LIBDIR = '@LIBDIR@';
 my $VERSION = '@VERSION@';
 my $VERBOSE = FALSE;
+my $CLAWSV = undef;
 my $main_window = undef;
 
 my $locale = (defined($ENV{LC_MESSAGES}) ? $ENV{LC_MESSAGES} : $ENV{LANG});
@@ -1018,10 +1019,9 @@ sub print_version() {
                  &Gtk2::minor_version, &Gtk2::micro_version);
     }
     print "\n";
-    my $clawsver = &get_claws_version;
-    $clawsver = ($clawsver eq "") ? 
+    my $clawsver = ($CLAWSV eq "") ? 
                 _("was not found!") : 
-                (_("returned version ") . $clawsver);
+                (_("returned version ") . $CLAWSV);
     print "Claws Mail " . $clawsver . "\n";
 }
 
@@ -1051,6 +1051,7 @@ sub command_line_fatal() {
 
 # parse the command line
 sub parse_command_line() {
+    $CLAWSV = &get_claws_version;
     my $arg = 0;
     while (defined($ARGV[$arg])) {
         for ($ARGV[$arg]) {
@@ -1066,6 +1067,14 @@ sub parse_command_line() {
                $VERBOSE = TRUE;
                last;
            };
+           /--use-claws-version/ && do {
+               ++$arg;
+               &command_line_fatal ("required version")
+                   unless defined($ARGV[$arg]);
+               &command_line_fatal ("required a dotted numeric value")
+                   unless ($ARGV[$arg] =~ /[\d\.]+/);
+               $CLAWSV = $ARGV[$arg];
+           };
            /--alternate-config-dir/ && do {
                ++$arg;
                &command_line_fatal ($xl::s{e_requireddir})