diff --git a/Netdisco/Changes b/Netdisco/Changes index 63790588..11d864ab 100644 --- a/Netdisco/Changes +++ b/Netdisco/Changes @@ -10,6 +10,7 @@ * [#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 * [#64] Addition of Wireshark abbreviations for OUI manufacturers + * [#79] Support perlbrew environment as alternative to localenv [BUG FIXES] diff --git a/Netdisco/bin/netdisco-daemon b/Netdisco/bin/netdisco-daemon index f34b537b..8b05c382 100755 --- a/Netdisco/bin/netdisco-daemon +++ b/Netdisco/bin/netdisco-daemon @@ -15,7 +15,9 @@ BEGIN { exec($localenv, $0, @ARGV) if -f $localenv; $localenv = File::Spec->catfile($home, 'perl5', 'bin', '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}; } } diff --git a/Netdisco/bin/netdisco-deploy b/Netdisco/bin/netdisco-deploy index 67363c55..0fb189d4 100755 --- a/Netdisco/bin/netdisco-deploy +++ b/Netdisco/bin/netdisco-deploy @@ -12,7 +12,9 @@ BEGIN { exec($localenv, $0, @ARGV) if -f $localenv; $localenv = File::Spec->catfile($home, 'perl5', 'bin', '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}; } } diff --git a/Netdisco/bin/netdisco-do b/Netdisco/bin/netdisco-do index 1d691145..242c84bd 100755 --- a/Netdisco/bin/netdisco-do +++ b/Netdisco/bin/netdisco-do @@ -12,7 +12,9 @@ BEGIN { exec($localenv, $0, @ARGV) if -f $localenv; $localenv = File::Spec->catfile($home, 'perl5', 'bin', '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}; } } diff --git a/Netdisco/bin/netdisco-web b/Netdisco/bin/netdisco-web index 6818cbe1..d41d24d1 100755 --- a/Netdisco/bin/netdisco-web +++ b/Netdisco/bin/netdisco-web @@ -15,7 +15,9 @@ BEGIN { exec($localenv, $0, @ARGV) if -f $localenv; $localenv = File::Spec->catfile($home, 'perl5', 'bin', '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}; } }