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

[#79] Support perlbrew environment as alternative to localenv

Browse Source
This commit is contained in:
Oliver Gorwits
2014-01-11 10:09:07 +00:00
parent b0e8c7413d
commit 693e0bd6db
5 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/Changes
View File

@@ -10,6 +10,7 @@
* [#66] Remove reference to "native" VLAN in code and replace with "untagged" * [#66] Remove reference to "native" VLAN in code and replace with "untagged"
* [#66] DB Schema update to add "native" column to PK of device_port_vlan table * [#66] DB Schema update to add "native" column to PK of device_port_vlan table
* [#64] Addition of Wireshark abbreviations for OUI manufacturers * [#64] Addition of Wireshark abbreviations for OUI manufacturers
* [#79] Support perlbrew environment as alternative to localenv
[BUG FIXES] [BUG FIXES]

4
Netdisco/bin/netdisco-daemon
View File

@@ -15,7 +15,9 @@ BEGIN {
exec($localenv, $0, @ARGV) if -f $localenv; exec($localenv, $0, @ARGV) if -f $localenv;
$localenv = File::Spec->catfile($home, 'perl5', 'bin', 'localenv'); $localenv = File::Spec->catfile($home, 'perl5', 'bin', 'localenv');
exec($localenv, $0, @ARGV) if -f $localenv; exec($localenv, $0, @ARGV) if -f $localenv;
die "Sorry, can't find libs required for App::Netdisco.\n";
die "Sorry, can't find libs required for App::Netdisco.\n"
if !exists $ENV{PERLBREW_PERL};
} }
} }

4
Netdisco/bin/netdisco-deploy
View File

@@ -12,7 +12,9 @@ BEGIN {
exec($localenv, $0, @ARGV) if -f $localenv; exec($localenv, $0, @ARGV) if -f $localenv;
$localenv = File::Spec->catfile($home, 'perl5', 'bin', 'localenv'); $localenv = File::Spec->catfile($home, 'perl5', 'bin', 'localenv');
exec($localenv, $0, @ARGV) if -f $localenv; exec($localenv, $0, @ARGV) if -f $localenv;
die "Sorry, can't find libs required for App::Netdisco.\n";
die "Sorry, can't find libs required for App::Netdisco.\n"
if !exists $ENV{PERLBREW_PERL};
} }
} }

4
Netdisco/bin/netdisco-do
View File

@@ -12,7 +12,9 @@ BEGIN {
exec($localenv, $0, @ARGV) if -f $localenv; exec($localenv, $0, @ARGV) if -f $localenv;
$localenv = File::Spec->catfile($home, 'perl5', 'bin', 'localenv'); $localenv = File::Spec->catfile($home, 'perl5', 'bin', 'localenv');
exec($localenv, $0, @ARGV) if -f $localenv; exec($localenv, $0, @ARGV) if -f $localenv;
die "Sorry, can't find libs required for App::Netdisco.\n";
die "Sorry, can't find libs required for App::Netdisco.\n"
if !exists $ENV{PERLBREW_PERL};
} }
} }

4
Netdisco/bin/netdisco-web
View File

@@ -15,7 +15,9 @@ BEGIN {
exec($localenv, $0, @ARGV) if -f $localenv; exec($localenv, $0, @ARGV) if -f $localenv;
$localenv = File::Spec->catfile($home, 'perl5', 'bin', 'localenv'); $localenv = File::Spec->catfile($home, 'perl5', 'bin', 'localenv');
exec($localenv, $0, @ARGV) if -f $localenv; exec($localenv, $0, @ARGV) if -f $localenv;
die "Sorry, can't find libs required for App::Netdisco.\n";
die "Sorry, can't find libs required for App::Netdisco.\n"
if !exists $ENV{PERLBREW_PERL};
} }
} }