Skip to content

* Use path.resolve for frameworkPath #244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 26, 2015
Merged

* Use path.resolve for frameworkPath #244

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/services/platform-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ export class PlatformService implements IPlatformService {

var downloadedPackagePath = this.$npm.install(packageToInstall, npmOptions).wait();
var frameworkDir = path.join(downloadedPackagePath, constants.PROJECT_FRAMEWORK_FOLDER_NAME);
frameworkDir = path.resolve(frameworkDir);

try {
this.addPlatformCore(platformData, frameworkDir).wait();
Expand All @@ -92,7 +93,7 @@ export class PlatformService implements IPlatformService {
platformData.platformProjectService.createProject(platformData.projectRoot, frameworkDir).wait();
var installedVersion = this.$fs.readJson(path.join(frameworkDir, "../", "package.json")).wait().version;

if(options.frameworkPath && !options.symlink) {
if(options.frameworkPath && this.$fs.getFsStats(options.frameworkPath).wait().isFile() && !options.symlink) {
// Need to remove unneeded node_modules folder
// One level up is the runtime module and one above is the node_modules folder.
this.$fs.deleteDirectory(path.join(frameworkDir, "../../")).wait();
Expand Down