Skip to content

Commit

Permalink
temp fix for #742
Browse files Browse the repository at this point in the history
seems to work fine on both Windows and *nix now
  • Loading branch information
alexweissman committed Jun 22, 2017
1 parent 300efb4 commit d6f2374
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## v4.1.1-Alpha
- Fixed missing template in ExceptionHandler and `notFoundHandler`
- Migration rollback will throw a warning if a class is not found instead of aborting
- Temporary fix for trouble with `npm install` in Windows (#742)

## v4.1.0-Alpha
- Switch from pagination "plugin" to "widget" for Tablesorter. Allows us to update to the latest version of TS (fix #688, #715)
Expand Down
7 changes: 6 additions & 1 deletion app/system/Bakery/Command/BuildAssets.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,12 @@ protected function npmInstall()
{
$this->io->section("<info>Installing npm dependencies</info>");
$this->io->writeln("> <comment>npm install</comment>");
passthru("npm install --prefix " . $this->buildPath);

// Temporarily change the working directory so we can install npm dependencies
$wd = getcwd();
chdir($this->buildPath);
passthru("npm install");
chdir($wd);
}

/**
Expand Down

0 comments on commit d6f2374

Please sign in to comment.