diff --git a/.travis.yml b/.travis.yml index e7d8a46..982f422 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,11 @@ addons: - libmysqlclient-dev - autoconf - libtool + - libdb-dev + - build-essential + - libssl-dev + - libexpat1-dev + - libdbd-mysql-perl perl: - 5.14 services: diff --git a/install_dependencies.sh b/install_dependencies.sh index 0bc7262..5bd2657 100755 --- a/install_dependencies.sh +++ b/install_dependencies.sh @@ -31,13 +31,13 @@ sudo make install cd $start_dir -cpanm Dist::Zilla -dzil authordeps --missing | cpanm -dzil listdeps | cpanm -cpanm File::Slurp DBI XML::TreePP Bio::DB::EUtilities Parallel::ForkManager Spreadsheet::ParseExcel Test::MockObject Time::Format DBD::mysql YAML::XS IO::Capture::Stderr +cpanm --notest Dist::Zilla +dzil authordeps --missing | cpanm --notest +dzil listdeps | cpanm --notest +cpanm --notest File::Slurp DBI XML::TreePP Bio::DB::EUtilities Parallel::ForkManager Spreadsheet::ParseExcel Test::MockObject Time::Format DBD::mysql YAML::XS IO::Capture::Stderr export LD_LIBRARY_PATH=/usr/local/lib #Template set +eu -set +x \ No newline at end of file +set +x diff --git a/lib/Pathogens/ConfigSettings.pm b/lib/Pathogens/ConfigSettings.pm index e45ce74..6c55b03 100644 --- a/lib/Pathogens/ConfigSettings.pm +++ b/lib/Pathogens/ConfigSettings.pm @@ -20,7 +20,9 @@ has 'settings' => ( is => 'rw', isa => 'HashRef', lazy_build => 1 ); sub _build_settings { my $self = shift; - my %config_settings = %{ Load( scalar read_file("config/".$self->environment."/".$self->filename.""))}; + my $directory = (defined $ENV{'UPDATE_PIPELINE_CONFIG_PATH'}) ? $ENV{'UPDATE_PIPELINE_CONFIG_PATH'} : "config/" . $self->environment ; + + my %config_settings = %{ Load( scalar read_file($directory . "/" . $self->filename.""))}; return \%config_settings; }