Skip to content

Commit 2217b66

Browse files
drupoljeanp413
authored andcommitted
fix: make sure user-data-dir command line parameter is customizable
The `--user-data-dir` command-line parameter is currently unusable. Its functionality is hampered due to an automatically appended `/data` directory, rendering the parameter completely ineffective. The proposed minor modification allows users to accurately customize this variable, enhancing its utility.
1 parent 14f4f93 commit 2217b66

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/vs/server/node/server.main.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ const errorReporter: ErrorReporter = {
3737
const args = parseArgs(process.argv.slice(2), serverOptions, errorReporter);
3838

3939
const REMOTE_DATA_FOLDER = args['server-data-dir'] || process.env['VSCODE_AGENT_FOLDER'] || join(os.homedir(), product.serverDataFolderName || '.vscode-remote');
40-
const USER_DATA_PATH = join(REMOTE_DATA_FOLDER, 'data');
40+
const USER_DATA_PATH = args['user-data-dir'] || join(REMOTE_DATA_FOLDER, 'data');
4141
const APP_SETTINGS_HOME = join(USER_DATA_PATH, 'User');
4242
const GLOBAL_STORAGE_HOME = join(APP_SETTINGS_HOME, 'globalStorage');
4343
const LOCAL_HISTORY_HOME = join(APP_SETTINGS_HOME, 'History');
4444
const MACHINE_SETTINGS_HOME = join(USER_DATA_PATH, 'Machine');
45-
args['user-data-dir'] = USER_DATA_PATH;
4645
const APP_ROOT = dirname(FileAccess.asFileUri('').fsPath);
4746
const BUILTIN_EXTENSIONS_FOLDER_PATH = join(APP_ROOT, 'extensions');
47+
args['user-data-dir'] = USER_DATA_PATH;
4848
args['builtin-extensions-dir'] = BUILTIN_EXTENSIONS_FOLDER_PATH;
4949
args['extensions-dir'] = args['extensions-dir'] || join(REMOTE_DATA_FOLDER, 'extensions');
5050

0 commit comments

Comments
 (0)