Permalink
Browse files

Merge branch 'master' into offline-bootstrap

Conflicts:
	bootstrap.pl
  • Loading branch information...
2 parents 2167d8b + 04b6755 commit b6104c9e6ab27fb35af91ffc445f338c5cf6a23b @tadzik committed Jul 25, 2012
Showing with 14 additions and 6 deletions.
  1. +14 −6 bootstrap.pl
View
@@ -11,15 +11,23 @@
.close;
}
+my $oldenv = %*ENV<PERL6LIB> // '';
+my $env_sep = $*VM<config><osname> eq 'MSWin32' ?? ';' !! ':';
+
+
if %*ENV<DESTDIR> {
- %*ENV<PERL6LIB> ~= ":{cwd}/{%*ENV<DESTDIR>}/lib"
+ %*ENV<PERL6LIB> ~= "{$env_sep}{cwd}/{%*ENV<DESTDIR>}/lib"
}
-%*ENV<PERL6LIB> ~= ":{cwd}/ext/File__Tools/lib";
-%*ENV<PERL6LIB> ~= ":{cwd}/ext/JSON__Tiny/lib";
-%*ENV<PERL6LIB> ~= ":{cwd}/ext/Test__Mock/lib";
-%*ENV<PERL6LIB> ~= ":{cwd}/lib";
+%*ENV<PERL6LIB> ~= "{$env_sep}{cwd}/ext/File__Tools/lib";
+%*ENV<PERL6LIB> ~= "{$env_sep}{cwd}/ext/JSON__Tiny/lib";
+%*ENV<PERL6LIB> ~= "{$env_sep}{cwd}/ext/Test__Mock/lib";
+%*ENV<PERL6LIB> ~= "{$env_sep}{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 File::Tools JSON::Tiny Test::Mock .";
+shell "perl6 bin/panda install .";
unlink "$home/.panda/projects.json";

0 comments on commit b6104c9

Please sign in to comment.