💄

Benjamin Pasero · Benjamin Pasero · commit 549cda29da55 · 2017-12-20T16:57:40.000+01:00
diff --git a/resources/linux/bin/code.sh b/resources/linux/bin/code.sh
@@ -3,11 +3,11 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for license information.
 
-# If root, ensure that --user-data-dir or --sudo-write is specified
+# If root, ensure that --user-data-dir or --file-write is specified
 if [ "$(id -u)" = "0" ]; then
 	for i in $@
 	do
-		if [[ $i == --user-data-dir=* || $i == --sudo-write ]]; then
+		if [[ $i == --user-data-dir=* || $i == --file-write ]]; then
 			CAN_LAUNCH_AS_ROOT=1
 		fi
 	done
diff --git a/src/vs/code/node/cli.ts b/src/vs/code/node/cli.ts
@@ -57,8 +57,8 @@ export async function main(argv: string[]): TPromise<any> {
 		return mainCli.then(cli => cli.main(args));
 	}
 
-	// Write Elevated
-	else if (args['sudo-write']) {
+	// Write File
+	else if (args['file-write']) {
 		const source = args._[0];
 		const target = args._[1];
 
@@ -69,15 +69,15 @@ export async function main(argv: string[]): TPromise<any> {
 			!fs.existsSync(source) || !fs.statSync(source).isFile() ||	// make sure source exists as file
 			!fs.existsSync(target) || !fs.statSync(target).isFile()		// make sure target exists as file
 		) {
-			return TPromise.wrapError(new Error('Using --sudo-write with invalid arguments.'));
+			return TPromise.wrapError(new Error('Using --file-write with invalid arguments.'));
 		}
 
 		try {
 
 			// Check for readonly status and chmod if so if we are told so
 			let targetMode: number;
 			let restoreMode = false;
-			if (!!args['sudo-chmod']) {
+			if (!!args['file-chmod']) {
 				targetMode = fs.statSync(target).mode;
 				if (!(targetMode & 128) /* readonly */) {
 					fs.chmodSync(target, targetMode | 128);
@@ -106,7 +106,7 @@ export async function main(argv: string[]): TPromise<any> {
 				fs.chmodSync(target, targetMode);
 			}
 		} catch (error) {
-			return TPromise.wrapError(new Error(`Using --sudo-write resulted in an error: ${error}`));
+			return TPromise.wrapError(new Error(`Using --file-write resulted in an error: ${error}`));
 		}
 
 		return TPromise.as(null);
diff --git a/src/vs/platform/environment/common/environment.ts b/src/vs/platform/environment/common/environment.ts
@@ -52,8 +52,8 @@ export interface ParsedArgs {
 	'disable-updates'?: string;
 	'disable-crash-reporter'?: string;
 	'skip-add-to-recently-opened'?: boolean;
-	'sudo-write'?: boolean;
-	'sudo-chmod'?: boolean;
+	'file-write'?: boolean;
+	'file-chmod'?: boolean;
 }
 
 export const IEnvironmentService = createDecorator<IEnvironmentService>('environmentService');
diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts
@@ -57,8 +57,8 @@ const options: minimist.Opts = {
 		'disable-crash-reporter',
 		'skip-add-to-recently-opened',
 		'status',
-		'sudo-write',
-		'sudo-chmod'
+		'file-write',
+		'file-chmod'
 	],
 	alias: {
 		add: 'a',
diff --git a/src/vs/workbench/services/files/node/fileService.ts b/src/vs/workbench/services/files/node/fileService.ts
@@ -621,9 +621,9 @@ export class FileService implements IFileService {
 
 						const sudoCommand: string[] = [`"${this.options.elevationSupport.cliPath}"`];
 						if (options.overwriteReadonly) {
-							sudoCommand.push('--sudo-chmod');
+							sudoCommand.push('--file-chmod');
 						}
-						sudoCommand.push('--sudo-write', `"${tmpPath}"`, `"${absolutePath}"`);
+						sudoCommand.push('--file-write', `"${tmpPath}"`, `"${absolutePath}"`);
 
 						sudoPrompt.exec(sudoCommand.join(' '), promptOptions, (error: string, stdout: string, stderr: string) => {
 							if (error || stderr) {
