make bootstrap.pl more robust

do not add ext/ to lib once ext/ is installed
tadzik · Jul 13, 2012 · 04b6755 · 04b6755
1 parent a5814af
commit 04b6755
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/bootstrap.pl b/bootstrap.pl
@@ -1,5 +1,8 @@
 use v6;
 
-%*ENV<PERL6LIB> = "{%*ENV<PERL6LIB> // ''}:{cwd}/ext:{cwd}/lib";
+my $oldenv  = %*ENV<PERL6LIB> // '';
+my $env_sep = $*VM<config><osname> eq 'MSWin32' ?? ';' !! ':';
+%*ENV<PERL6LIB> = join $env_sep, $oldenv, cwd() ~ '/ext', cwd() ~ '/lib';
 shell "perl6 bin/panda install File::Tools JSON::Tiny Test::Mock";
+%*ENV<PERL6LIB> = join $env_sep, $oldenv, cwd() ~ '/lib';
 shell "perl6 bin/panda install .";