135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

re-set NETDISCO_HOME after environment is discovered

Browse Source
This commit is contained in:
Oliver Gorwits
2014-04-18 23:26:21 +01:00
parent 0b50b54a67
commit bf7b23b3c6
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/lib/App/Netdisco/Environment.pm
View File

@@ -15,6 +15,7 @@ BEGIN {
my $me = File::Spec->catfile($FindBin::RealBin, $FindBin::RealScript); my $me = File::Spec->catfile($FindBin::RealBin, $FindBin::RealScript);
my $uid = (stat($me))[4] || 0; my $uid = (stat($me))[4] || 0;
my $home = ($ENV{NETDISCO_HOME} || (getpwuid($uid))[7] || $ENV{HOME}); my $home = ($ENV{NETDISCO_HOME} || (getpwuid($uid))[7] || $ENV{HOME});
$ENV{NETDISCO_HOME} ||= $home;
my $auto = dir(dist_dir('App-Netdisco'))->absolute; my $auto = dir(dist_dir('App-Netdisco'))->absolute;

2
Netdisco/lib/App/Netdisco/Web/Report.pm
View File

@@ -23,7 +23,7 @@ get '/report/*' => require_login sub {
if (3 == scalar keys %params) { if (3 == scalar keys %params) {
foreach my $col ( @{ var('module_options') } ) { foreach my $col ( @{ var('module_options') } ) {
next unless $col->{default} eq 'on'; next unless $col->{default} eq 'on';
%params{ $col->{name} } = 'checked'; $params{ $col->{name} } = 'checked';
} }
} }
} }