From bf7b23b3c6c6cfa948b5c8e32c75c75c860fcc83 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Fri, 18 Apr 2014 23:26:21 +0100 Subject: [PATCH] re-set NETDISCO_HOME after environment is discovered --- Netdisco/lib/App/Netdisco/Environment.pm | 1 + Netdisco/lib/App/Netdisco/Web/Report.pm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Netdisco/lib/App/Netdisco/Environment.pm b/Netdisco/lib/App/Netdisco/Environment.pm index dace8729..8218ce15 100644 --- a/Netdisco/lib/App/Netdisco/Environment.pm +++ b/Netdisco/lib/App/Netdisco/Environment.pm @@ -15,6 +15,7 @@ BEGIN { my $me = File::Spec->catfile($FindBin::RealBin, $FindBin::RealScript); my $uid = (stat($me))[4] || 0; my $home = ($ENV{NETDISCO_HOME} || (getpwuid($uid))[7] || $ENV{HOME}); + $ENV{NETDISCO_HOME} ||= $home; my $auto = dir(dist_dir('App-Netdisco'))->absolute; diff --git a/Netdisco/lib/App/Netdisco/Web/Report.pm b/Netdisco/lib/App/Netdisco/Web/Report.pm index 316b4e37..2a27fe7c 100644 --- a/Netdisco/lib/App/Netdisco/Web/Report.pm +++ b/Netdisco/lib/App/Netdisco/Web/Report.pm @@ -23,7 +23,7 @@ get '/report/*' => require_login sub { if (3 == scalar keys %params) { foreach my $col ( @{ var('module_options') } ) { next unless $col->{default} eq 'on'; - %params{ $col->{name} } = 'checked'; + $params{ $col->{name} } = 'checked'; } } }