diff options
-rwxr-xr-x | renrot | 47 |
1 files changed, 13 insertions, 34 deletions
@@ -303,4 +303,2 @@ sub die_renrot { sub getOptions { - my $showVersion = 0; # need version - my $showHelp = 0; # need help my @tmpTags = (); @@ -328,3 +326,3 @@ sub getOptions { - my $getOptions = GetOptions ( + GetOptions ( # AGGREGATION @@ -386,3 +384,3 @@ sub getOptions { "generate-thumb|g" => \$gen_thm, - "help|?" => \$showHelp, + "help|?" => sub { usage(0, 2) }, "no-rename|norename" => \$noRename, @@ -399,5 +397,5 @@ sub getOptions { "v+" => \$verbose, - "version" => \$showVersion, + "version" => sub { usage(0, 0) }, "work-directory|d=s" => \$workDir, - ); + ) or usage(1, 1); @@ -449,12 +447,2 @@ sub getOptions { - if ($showHelp != 0) { - usage(); - exit 0; - } - - if ($showVersion != 0) { - infomsg ("RenRot version $VERSION (r$REVISION)\n"); - exit 0; - } - if ($extToProcess eq "" and ($fileCount == 0) and $subFileSet eq "") { @@ -468,7 +456,2 @@ sub getOptions { - if ($getOptions == 0) { - usage(); - exit 1; - } - if ($noRenRoTagMtm != 0) { @@ -1577,11 +1560,8 @@ sub rotateThumbnail { sub usage { - # catch warnings if we have problems running perldoc - my $evalWarning; - local $SIG{'__WARN__'} = sub { $evalWarning = $_[0] }; - my $dummy = \*SAVEERR; # avoid "used only once" warning - unless ($^O eq 'os2') { - open SAVEERR, ">&STDERR"; - open STDERR, '>/dev/null'; - } - if (system('perldoc', $0)) { + my $exitcode = shift; + my $verbose = shift; + + if ($verbose == 0) { + infomsg ("RenRot version $VERSION (r$REVISION)\n"); + } elsif ($verbose == 1) { infomsg ( @@ -1620,7 +1600,6 @@ Consult the documentation for a full list of options. "); + } elsif ($verbose == 2) { + pod2usage(-verbose => 2); } - unless ($^O eq 'os2') { - close STDERR; - open STDERR, '>&SAVEERR'; - } + exit $exitcode; } |