mirror of
https://github.com/fspc/gbootroot.git
synced 2025-03-12 07:43:22 -04:00
Hopefully, this solves another @INC bug.
This commit is contained in:
parent
ad86310594
commit
29d2468498
@ -28,9 +28,11 @@ BEGIN {
|
||||
|
||||
my $fhs = grep(/\/usr\/share\/perl5/,@INC);
|
||||
|
||||
|
||||
unshift(@INC,"."); # better make sure we mean . when we mean .
|
||||
|
||||
if ($fhs == 0) {
|
||||
unshift(@INC,"/usr/share/perl5");
|
||||
unshift(@INC,"."); # better make sure we mean . when we mean .
|
||||
}
|
||||
|
||||
|
||||
|
@ -220,9 +220,10 @@ BEGIN {
|
||||
|
||||
my $fhs = grep(/\/usr\/share\/perl5/,@INC);
|
||||
|
||||
unshift(@INC,"."); # better make sure we mean . when we mean .
|
||||
|
||||
if ($fhs == 0) {
|
||||
unshift(@INC,"/usr/share/perl5");
|
||||
unshift(@INC,"."); # better make sure we mean . when we mean .
|
||||
}
|
||||
|
||||
|
||||
|
@ -30,10 +30,14 @@
|
||||
##
|
||||
##############################################################################
|
||||
|
||||
|
||||
|
||||
BEGIN {
|
||||
|
||||
my $fhs = grep(/\/usr\/share\/perl5/,@INC);
|
||||
|
||||
unshift(@INC,"."); # better make sure we mean . when we mean .
|
||||
|
||||
if ($fhs == 0) {
|
||||
unshift(@INC,"/usr/share/perl5");
|
||||
}
|
||||
@ -49,8 +53,20 @@ BEGIN {
|
||||
$ENV{'PATH'} = "/usr/sbin:" . $ENV{'PATH'};
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
my $pwd = `pwd`; chomp $pwd;
|
||||
|
||||
my $tools = grep(/$pwd\/user-mode-linux\/usr\/bin/,$ENV{'PATH'});
|
||||
if ($tools == 0) {
|
||||
$ENV{'PATH'} = "$pwd/user-mode-linux/usr/bin:" . $ENV{'PATH'};
|
||||
}
|
||||
|
||||
$tools = grep(/$pwd\/user-mode-linux\/usr\/lib\/uml/,$ENV{'PATH'});
|
||||
if ($tools == 0) {
|
||||
$ENV{'PATH'} = "$pwd/user-mode-linux/usr/lib\/uml:" . $ENV{'PATH'};
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
use strict;
|
||||
use BootRoot::Yard;
|
||||
|
Loading…
x
Reference in New Issue
Block a user