Skip to content

Commit b22ca15

Browse files
Merge pull request #148 from NativeScript/vladimirov/fix-cache-folder
Change setting of profile-dir
2 parents 7844f2c + ec0c766 commit b22ca15

File tree

3 files changed

+20
-3
lines changed

3 files changed

+20
-3
lines changed

lib/options.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import path = require("path");
44
import helpers = require("./common/helpers");
55
import commonOptions = require("./common/options");
66
import osenv = require("osenv");
7+
import hostInfo = require("./common/host-info");
78

89
var knownOpts:any = {
910
"frameworkPath": String,
@@ -23,11 +24,19 @@ var knownOpts:any = {
2324
_.extend(knownOpts, commonOptions.knownOpts);
2425
_.extend(shorthands, commonOptions.shorthands);
2526

26-
commonOptions.setProfileDir(".nativescript-cli");
27+
var defaultProfileDir = "";
28+
var nativeScriptCacheFolder = ".nativescript-cli";
29+
if(hostInfo.isWindows()) {
30+
defaultProfileDir = path.join(process.env.LocalAppData, nativeScriptCacheFolder);
31+
} else {
32+
defaultProfileDir = path.join(osenv.home(), ".local/share", nativeScriptCacheFolder);
33+
}
34+
35+
commonOptions.setProfileDir(defaultProfileDir);
2736
var parsed = helpers.getParsedOptions(knownOpts, shorthands);
2837

2938
Object.keys(parsed).forEach((opt) => exports[opt] = parsed[opt]);
3039
exports.knownOpts = knownOpts;
3140

3241
declare var exports:any;
33-
export = exports;
42+
export = exports;

test/stubs.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,14 @@ export class FileSystemStub implements IFileSystem {
119119
symlink(sourePath: string, destinationPath: string): IFuture<void> {
120120
return undefined;
121121
}
122+
123+
closeStream(stream: any): IFuture<void> {
124+
return undefined;
125+
}
126+
127+
setCurrentUserAsOwner(path: string, owner: string): IFuture<void> {
128+
return undefined;
129+
}
122130
}
123131

124132
export class ErrorsStub implements IErrors {

0 commit comments

Comments
 (0)