Selaa lähdekoodia

if pisg can't find the config file in the current directory (when running
from crontab), then try opening the config file in which pisg.pl resides
instead..

Morten Brix Pedersen 25 vuotta sitten
vanhempi
commit
50e4fa69a0
1 muutettua tiedostoa jossa 2 lisäystä ja 2 poistoa
  1. 2 2
      pisg.pl

+ 2 - 2
pisg.pl

@@ -2,6 +2,7 @@
 
 
 use strict;
 use strict;
 use Getopt::Long;
 use Getopt::Long;
+use FindBin;
 
 
 # pisg - Perl IRC Statistics Generator
 # pisg - Perl IRC Statistics Generator
 #
 #
@@ -274,7 +275,7 @@ sub init_config
 {
 {
     get_cmdlineoptions();
     get_cmdlineoptions();
 
 
-    if (open(CONFIG, $conf->{configfile})) {
+    if ((open(CONFIG, $conf->{configfile}) or open(CONFIG, $FindBin::Bin . "/$conf->{configfile}"))) {
         print "Using config file: $conf->{configfile}\n";
         print "Using config file: $conf->{configfile}\n";
 
 
         my $lineno = 0;
         my $lineno = 0;
@@ -2210,7 +2211,6 @@ END_USAGE
 
 
 sub get_language_templates
 sub get_language_templates
 {
 {
-    use FindBin;
 
 
     open(FILE, $conf->{langfile}) or open (FILE, $FindBin::Bin . "/$conf->{langfile}") or die("$0: Unable to open language file($conf->{langfile}): $!\n");
     open(FILE, $conf->{langfile}) or open (FILE, $FindBin::Bin . "/$conf->{langfile}") or die("$0: Unable to open language file($conf->{langfile}): $!\n");