Revert "set portable mode"

This reverts commit b295b722.

src/vs/code/node/cli.ts

@@ -8,7 +8,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { assign } from 'vs/base/common/objects';
 import { parseCLIProcessArgv, buildHelpMessage } from 'vs/platform/environment/node/argv';
 import { ParsedArgs } from 'vs/platform/environment/common/environment';
-import product, { IProductConfiguration } from 'vs/platform/node/product';
+import product from 'vs/platform/node/product';
 import pkg from 'vs/platform/node/package';
 import * as paths from 'path';
 import * as os from 'os';
@@ -19,7 +19,6 @@ import { resolveTerminalEncoding } from 'vs/base/node/encoding';
 import * as iconv from 'iconv-lite';
 import { writeFileAndFlushSync } from 'vs/base/node/extfs';
 import { isWindows } from 'vs/base/common/platform';
-import uri from 'vs/base/common/uri';
 
 function shouldSpawnCliProcess(argv: ParsedArgs): boolean {
 	return !!argv['install-source']
@@ -32,15 +31,6 @@ interface IMainCli {
 	main: (argv: ParsedArgs) => TPromise<void>;
 }
 
-function updateProductJsonSync(fn: (productJson: IProductConfiguration) => void): void {
-	const rootPath = paths.dirname(uri.parse(require.toUrl('')).fsPath);
-	const productJsonPath = paths.join(rootPath, 'product.json');
-	const product = JSON.parse(fs.readFileSync(productJsonPath, 'utf8')) as IProductConfiguration;
-	fn(product);
-
-	fs.writeFileSync(productJsonPath, JSON.stringify(product, null, '\t'), 'utf8');
-}
-
 export async function main(argv: string[]): TPromise<any> {
 	let args: ParsedArgs;
 
@@ -67,18 +57,6 @@ export async function main(argv: string[]): TPromise<any> {
 		return mainCli.then(cli => cli.main(args));
 	}
 
-	// Enable Portable
-	else if (args['set-portable']) {
-		updateProductJsonSync(product => product.portable = 'code-portable-data');
-		console.log('Portable mode enabled');
-	}
-
-	// Disable Portable
-	else if (args['unset-portable']) {
-		updateProductJsonSync(product => { delete product.portable; delete product.portableTemp; });
-		console.log('Portable mode disabled');
-	}
-
 	// Write File
 	else if (args['file-write']) {
 		const source = args._[0];

src/vs/platform/environment/node/argv.ts

@@ -64,9 +64,7 @@ const options: minimist.Opts = {
 		'status',
 		'file-write',
 		'file-chmod',
-		'driver-verbose',
-		'set-portable',
-		'unset-portable'
+		'driver-verbose'
 	],
 	alias: {
 		add: 'a',
@@ -152,8 +150,6 @@ const optionsHelp: { [name: string]: string; } = {
 	'-w, --wait': localize('wait', "Wait for the files to be closed before returning."),
 	'--locale <locale>': localize('locale', "The locale to use (e.g. en-US or zh-TW)."),
 	'--user-data-dir <dir>': localize('userDataDir', "Specifies the directory that user data is kept in. Can be used to open multiple distinct instances of Code."),
-	'--set-portable': localize('setPortable', "Enables portable mode"),
-	'--unset-portable': localize('unsedPortable', "Disables portable mode"),
 	'-v, --version': localize('version', "Print version."),
 	'-h, --help': localize('help', "Print usage.")
 };