diff options
| author | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2017-09-18 22:56:36 +0200 |
|---|---|---|
| committer | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2017-09-18 23:04:45 +0200 |
| commit | c4d5e329acddb83df43254990f98c53cd5b1fbf7 (patch) | |
| tree | f3fd988b82bc98a4fe52cc31a33ea31a6ab59470 /src | |
| parent | 848214f788cb561935b8200d6e795df2de1cb8fa (diff) | |
exipick: add -C|--config option
This fits better to
echo test | exim -C /tmp/test.conf -v test@example.com
exipick -C /tmp/test.conf
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/exipick.src | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/src/exipick.src b/src/src/exipick.src index 4999d843f..4751f7657 100644 --- a/src/src/exipick.src +++ b/src/src/exipick.src @@ -42,6 +42,7 @@ $| = 1; # unbuffer STDOUT Getopt::Long::Configure("bundling_override"); GetOptions( 'spool=s' => \$G::spool, # exim spool dir + 'C|Config=s' => \$G::config, # use alternative Exim configuration file 'input-dir=s' => \$G::input_dir, # name of the "input" dir 'finput' => \$G::finput, # same as "--input-dir Finput" 'bp' => \$G::mailq_bp, # List the queue (noop - default) @@ -115,8 +116,8 @@ $G::msg_ids = {}; # short circuit when crit is only MID $G::caseless = $G::caseful ? 0 : 1; # nocase by default, case if both @G::recipients_crit = (); # holds per-recip criteria $spool = defined $G::spool ? $G::spool - : do { chomp($_ = `$exim -n -bP spool_directory`); - $_ // $spool }; + : do { chomp($_ = `$exim @{[defined $G::config ? "-C $G::config" : '']} -n -bP spool_directory`) + and $_ or $spool }; my $input_dir = $G::input_dir || ($G::finput ? "Finput" : "input"); my $count_only = 1 if ($G::mailq_bpc || $G::qgrep_c); my $unsorted = 1 if ($G::mailq_bpr || $G::mailq_bpra || @@ -1354,6 +1355,11 @@ Same as '-bpu --unsorted' (exim) Same as -bp, but only show undelivered messages (exim) +=item -C | --config <config> + +Use <config> to determine the proper spool directory. (See C<--spool> +or C<--input> for alternative ways to specify the directories to operate on.) + =item -c Show a count of matching messages (exiqgrep) @@ -1432,8 +1438,7 @@ Same as '$shown_message_size eq <string>' (exiqgrep) =item --spool <path> -Set the path to the exim spool to use. This value will have the argument to --input or 'input' appended, or be ignored if --input is a full path. If not specified, exipick uses the value from C<exim -bP spool_directory>, and if this fails, the F<SPOOL_DIRECTORY> -from build time (F<Local/Makefile>) is used. +Set the path to the exim spool to use. This value will have the argument to --input or 'input' appended, or be ignored if --input is a full path. If not specified, exipick uses the value from C<exim [-C config] -n -bP spool_directory>, and if this call fails, the F</opt/exim/spool> from build time (F<Local/Makefile>) is used. See also --config. =item --show-rules |