commit 2703d172e41d4bcd028a4c5b5f4e75d442e2d362
parent 8646d7990eef48a1081ecf89ed63bdd34210057e
Author: Kyle R W Milz <kyle@getaddrinfo.net>
Date: Wed, 13 Aug 2014 01:29:06 -0600
price_scraper: move more config file stuff into shared
Diffstat:
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/Shared.pm b/Shared.pm
@@ -23,6 +23,14 @@ sub get_dom
sub get_config
{
my $cfg_file = shift;
+ if (!defined $cfg_file) {
+ if (-e "price_scraper.cfg") {
+ $cfg_file = "price_scraper.cfg";
+ } else {
+ $cfg_file = "/etc/price_scraper.cfg";
+ }
+ }
+
my $parser = Config::Grammar->new({
_sections => ['vendors', 'paths'],
vendors => {
diff --git a/price_scraper.pl b/price_scraper.pl
@@ -15,10 +15,7 @@ use POSIX;
my %args;
getopts('f:np:v', \%args);
-my $cfg;
-$cfg = get_config("/etc/price_scraper.cfg") if (-e "/etc/price_scraper.cfg");
-$cfg = get_config("price_scraper.cfg") if (-e "price_scraper.cfg");
-$cfg = get_config($args{f}) if ($args{f});
+my $cfg = get_config($args{f});
my $dbh = DBI->connect(
"dbi:SQLite:dbname=pricechart.db",