diff options
author | Eric Wong <e@80x24.org> | 2020-09-01 01:15:01 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2020-09-02 08:53:55 +0000 |
commit | 16870b42ac68a8704467989cb20c2c571e4749ab (patch) | |
tree | abc78c7ad8e939044909f66a64e8c2fb5fa1cd58 /script/public-inbox-convert | |
parent | 6accd690b16aa0bce7117286944d69f378611eb8 (diff) | |
download | public-inbox-16870b42ac68a8704467989cb20c2c571e4749ab.tar.gz |
`-h' doesn't conflict with anything, and some users (including git users) may be more accustomed to using it rather than the rarely-seen-outside-of-Getopt::Long `-?' switch. We can also rely on the GetOptions() function to emit a proper error message instead of just "bad command-line args".
Diffstat (limited to 'script/public-inbox-convert')
-rwxr-xr-x | script/public-inbox-convert | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/script/public-inbox-convert b/script/public-inbox-convert index 4ff198d1..017411fb 100755 --- a/script/public-inbox-convert +++ b/script/public-inbox-convert @@ -4,9 +4,8 @@ use strict; use v5.10.1; use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev); -my $usage = 'Usage: public-inbox-convert [options] OLD NEW'; my $help = <<EOF; # the following should fit w/o scrolling in 80x24 term: -usage: $usage +usage: public-inbox-convert [options] OLD NEW convert v1 format inboxes to v2 @@ -15,9 +14,8 @@ options: --no-index do not index after conversion --jobs=NUM set shards (NUM=0) --verbose | -v increase verbosity (may be repeated) - --help | -? show this help -index options (see public-inbox-index(1) manpage for full description): +index options (see public-inbox-index(1) man page for full description): --no-fsync speed up indexing, risk corruption on power outage -L LEVEL `basic', `medium', or `full' (default: full) @@ -35,19 +33,17 @@ my $opt = { quiet => -1, compact => 0, maxsize => undef, fsync => 1, reindex => 1, # we always reindex }; -GetOptions($opt, qw(jobs|j=i index! help|?), +GetOptions($opt, qw(jobs|j=i index! help|h), # index options qw(verbose|v+ rethread compact|c+ fsync|sync! indexlevel|index-level|L=s max_size|max-size=s batch_size|batch-size=s sequential_shard|sequential-shard|seq-shard - )) or die <<EOF; -bad command-line args\n$usage -EOF + )) or die $help; if ($opt->{help}) { print $help; exit 0 }; my $old_dir = shift(@ARGV) // ''; my $new_dir = shift(@ARGV) // ''; -die $usage if (scalar(@ARGV) || $new_dir eq '' || $old_dir eq ''); +die $help if (scalar(@ARGV) || $new_dir eq '' || $old_dir eq ''); die "$new_dir exists\n" if -d $new_dir; die "$old_dir not a directory\n" unless -d $old_dir; |