Skip to content

Commit 5eda9d5

Browse files
committed
Merge pull request #138 from NativeScript/fatme/sync-with-common
Sync with latest common lib
2 parents 7c551f1 + 517a4e9 commit 5eda9d5

File tree

3 files changed

+3
-13
lines changed

3 files changed

+3
-13
lines changed

lib/options.ts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,37 +6,27 @@ import commonOptions = require("./common/options");
66
import osenv = require("osenv");
77

88
var knownOpts:any = {
9-
"log" : String,
10-
"verbose" : Boolean,
11-
"path" : String,
129
"frameworkPath": String,
13-
"appid" : String,
1410
"copy-from": String,
1511
"link-to": String,
1612
"release": Boolean,
1713
"device": Boolean,
1814
"emulator": Boolean,
19-
"version": Boolean,
20-
"help": Boolean,
2115
"keyStorePath": String,
2216
"keyStorePassword": String,
2317
"keyStoreAlias": String,
2418
"keyStoreAliasPassword": String
2519
},
2620
shorthands = {
27-
"v" : "verbose",
28-
"p" : "path"
2921
};
3022

3123
_.extend(knownOpts, commonOptions.knownOpts);
3224
_.extend(shorthands, commonOptions.shorthands);
3325

34-
var defaultProfileDir = path.join(osenv.home(), ".nativescript-cli");
26+
commonOptions.setProfileDir(".nativescript-cli");
3527
var parsed = helpers.getParsedOptions(knownOpts, shorthands);
36-
parsed["profile-dir"] = parsed["profile-dir"] || defaultProfileDir;
3728

3829
Object.keys(parsed).forEach((opt) => exports[opt] = parsed[opt]);
39-
4030
exports.knownOpts = knownOpts;
4131

4232
declare var exports:any;

lib/services/platform-service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ export class PlatformService implements IPlatformService {
263263

264264
var logFilePath = path.join(platformData.projectRoot, this.$projectData.projectName, "emulator.log");
265265

266-
emulatorServices.startEmulator(packageFile, {image: options.emulator, stderrFilePath: logFilePath, stdoutFilePath: logFilePath }).wait();
266+
emulatorServices.startEmulator(packageFile, { stderrFilePath: logFilePath, stdoutFilePath: logFilePath }).wait();
267267
}).future<void>()();
268268
}
269269

0 commit comments

Comments
 (0)