separate version option from help

[clawsker.git] / clawsker

diff --git a/clawsker b/clawsker
index 808cfee691d4a9b08c5dd1e73216eb171e3ce938..f2dae0a109f1ceb533ff703b7544485f8f298b9b 100755 (executable)
--- a/clawsker
+++ b/clawsker
@@ -983,10 +983,8 @@ sub new_colours_page() {
     return $cf;
 }
 
     return $cf;
 }
 

-# the command line help
-sub print_help() {
-    my $line = '-' x length ($xl::s{about_title}) . "\n";
-    print $line;
+# version info
+sub print_version() {

     print $xl::s{about_title} . "\n";
     print $xl::s{about_version} . " $VERSION\n";
     print "Perl-GLib " . $Glib::VERSION;
     print $xl::s{about_title} . "\n";
     print $xl::s{about_version} . " $VERSION\n";
     print "Perl-GLib " . $Glib::VERSION;


@@ -1004,11 +1002,19 @@ sub print_help() {
                  &Gtk2::minor_version, &Gtk2::micro_version);
     }
     print "\n";
                  &Gtk2::minor_version, &Gtk2::micro_version);
     }
     print "\n";

+}
+
+# the command line help
+sub print_help() {
+    my $line = '-' x length ($xl::s{about_title}) . "\n";
+    print $line;
+    print $xl::s{about_title} . "\n";

     print $line;
     print _("Syntax:\n");
     print _("    clawsker [options]\n");
     print _("Options:\n");
     print _("    --help                         Prints this help screen.\n");
     print $line;
     print _("Syntax:\n");
     print _("    clawsker [options]\n");
     print _("Options:\n");
     print _("    --help                         Prints this help screen.\n");

+    print _("    --version                      Prints version infos.\n");

     print _("    --verbose                      More messages on standard output.\n");
     print _("    --alternate-config-dir <dir>   Uses <dir> as Claws Mail config dir.\n");
     print _("    --clawsrc <file>               Uses <file> as full resource name.\n");
     print _("    --verbose                      More messages on standard output.\n");
     print _("    --alternate-config-dir <dir>   Uses <dir> as Claws Mail config dir.\n");
     print _("    --clawsrc <file>               Uses <file> as full resource name.\n");


@@ -1031,6 +1037,10 @@ sub parse_command_line() {
                &print_help; 
                 return FALSE;
            };
                &print_help; 
                 return FALSE;
            };

+            /--version/ && do { 
+               &print_version; 
+                return FALSE;
+           };

            /--verbose/ && do {
                $VERBOSE = TRUE;
                last;
            /--verbose/ && do {
                $VERBOSE = TRUE;
                last;