Update data and extension paths to match version one

To ensure users don't lose their extensions when updating.
This commit is contained in:
Asher 2019-08-21 17:02:31 -05:00
parent 950dad9489
commit ddd5a9ae79
No known key found for this signature in database
GPG Key ID: D63C1EF81242354A
1 changed files with 10 additions and 1 deletions

View File

@ -1,5 +1,6 @@
import * as cp from "child_process"; import * as cp from "child_process";
import * as os from "os"; import * as os from "os";
import * as path from "path";
import { setUnexpectedErrorHandler } from "vs/base/common/errors"; import { setUnexpectedErrorHandler } from "vs/base/common/errors";
import { main as vsCli } from "vs/code/node/cliProcessMain"; import { main as vsCli } from "vs/code/node/cliProcessMain";
import { validatePaths } from "vs/code/node/paths"; import { validatePaths } from "vs/code/node/paths";
@ -73,7 +74,15 @@ const getArgs = (): Args => {
options.push(last); options.push(last);
return validatePaths(parseMainProcessArgv(process.argv)); const args = parseMainProcessArgv(process.argv);
if (!args["user-data-dir"]) {
args["user-data-dir"] = path.join(process.env.XDG_DATA_HOME || path.join(os.homedir(), ".local/share"), "code-server");
}
if (!args["extensions-dir"]) {
args["extensions-dir"] = path.join(args["user-data-dir"], "extensions");
}
return validatePaths(args);
}; };
const startVscode = async (): Promise<void | void[]> => { const startVscode = async (): Promise<void | void[]> => {