From 39cb5672dfd5ff9aafdb5a8294c314d59d7a4bec Mon Sep 17 00:00:00 2001 From: Thomas Hochstein Date: Thu, 13 May 2010 19:31:49 +0200 Subject: [PATCH] Add "Program" to .yapfaqrc. Fixes #2. Signed-off-by: Thomas Hochstein --- .yapfaqrc | 1 + yapfaq.pl | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.yapfaqrc b/.yapfaqrc index d863ade..9b73fe3 100644 --- a/.yapfaqrc +++ b/.yapfaqrc @@ -3,3 +3,4 @@ NNTPUser = '' NNTPPass = '' Sender = '' ConfigFile = 'yapfaq.cfg' +Program = '' diff --git a/yapfaq.pl b/yapfaq.pl index 2817dca..71ce4a1 100644 --- a/yapfaq.pl +++ b/yapfaq.pl @@ -18,7 +18,7 @@ my $Version = "0.8-prelease"; # You may override the default .rc file (.yapfaqrc) by using "-c .rc file" my $RCFile = '.yapfaqrc'; # Valid configuration variables for use in a .rc file -my @ValidConfVars = ('NNTPServer','NNTPUser','NNTPPass','Sender','ConfigFile'); +my @ValidConfVars = ('NNTPServer','NNTPUser','NNTPPass','Sender','ConfigFile','Program'); ################################### Defaults ################################### # Please do not change anything in here! @@ -27,7 +27,8 @@ my %Config = (NNTPServer => "", NNTPUser => "", NNTPPass => "", Sender => "", - ConfigFile => "yapfaq.cfg"); + ConfigFile => "yapfaq.cfg", + Program => ""); ################################# Main program ################################# @@ -64,6 +65,8 @@ if (-f $RCFile) { warn "$0: W: .rc file $RCFile does not exist!\n"; } +$Options{'s'} = $Config{'Program'} if (!defined($Options{'s'})); + # read configuration (configured FAQs) my @Config; readconfig (\$Config{'ConfigFile'}, \@Config, \$Faq); @@ -639,6 +642,13 @@ This setting is optional. The configuration file defining the FAQ(s) to post. Must be set (or omitted; the default is "yapfaq.cfg"). +=item B = I (optional) + +A program the article is piped to instead of posting it to Usenet. +See option "-f" below (which takes preference). + +This setting is optional. + =back =head3 Example runtime configuration file @@ -648,6 +658,7 @@ omitted; the default is "yapfaq.cfg"). NNTPPass = '' Sender = '' ConfigFile = 'yapfaq.cfg' + Program = '' =head3 Using more than one runtime configuration @@ -713,6 +724,9 @@ For example, you may want to use the I utility from the INN package or the much more powerful replacement I from I which is able to sign postings. +If I is also defined in the runtime configuration file (by default +F<.yapfaqrc>), B<-s> takes preference. + =item B<-c> I<.rc file> Load another runtime configuration file (.rc file) than F<.yaofaq.rc>.