move launcher.js to cli.js

build/gulpfile.vscode.js

@@ -217,12 +217,12 @@ function packageTask(platform, arch, opts) {
 			.pipe(util.cleanNodeModule('native-keymap', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], true))
 			.pipe(util.cleanNodeModule('weak', ['binding.gyp', 'build/**', 'src/**'], true));
 
-		var resources = gulp.src(['resources/*','resources/common/**'], { base: '.' });
+		var resources;
 
 		if (platform === 'win32') {
-			resources = es.merge(resources, gulp.src('resources/win32/code_file.ico', { base: '.' }));
+			resources = gulp.src('resources/win32/code_file.ico', { base: '.' });
 		} else if (platform === 'linux') {
-			resources = es.merge(resources, gulp.src('resources/linux/code.png', { base: '.' }));
+			resources = gulp.src('resources/linux/code.png', { base: '.' });
 		}
 
 		var extraExtensions = util.downloadExtensions(builtInExtensions)
@@ -238,7 +238,7 @@ function packageTask(platform, arch, opts) {
 			sources,
 			deps,
 			extraExtensions,
-			resources
+			resources || es.through()
 		).pipe(util.skipDirectories());
 
 		var result = all

resources/common/bin/code.sh

@@ -3,29 +3,17 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for license information.
 
-if [[ "$OSTYPE" == "darwin"* ]]; then
-	if [ -x "/Applications/Visual Studio Code.app" ]; then
-		VSCODE_DIR="/Applications/Visual Studio Code.app/Contents/MacOS"
-	elif [ -x "$HOME/Applications/Visual Studio Code.app" ]; then
-		VSCODE_DIR="$HOME/Applications/Visual Studio Code.app/Contents/MacOS"
-	else
-		echo "Could not locate Visual Studio Code.app"
-		exit 1
-	fi
-	ELECTRON_FILE="Electron"
+VSCODE_DIR="/usr/share/code"
+if [ -x "$VSCODE_DIR/Code" ]; then
+	ELECTRON_FILE="Code"
+elif [ -x "$VSCODE_DIR/Code - OSS" ]; then
+	ELECTRON_FILE="Code - OSS"
 else
-	VSCODE_DIR="/usr/share/code"
-	if [ -x "$VSCODE_DIR/Code" ]; then
-		ELECTRON_FILE="Code"
-	elif [ -x "$VSCODE_DIR/Code - OSS" ]; then
-		ELECTRON_FILE="Code - OSS"
-	else
-		echo "Could not locate Visual Studio Code executable."
-		exit 1
-	fi
+	echo "Could not locate Visual Studio Code executable."
+	exit 1
 fi
 
-VSCODE_LAUNCHER="$VSCODE_DIR/resources/app/resources/common/bin/launcher.js"
+VSCODE_LAUNCHER="$VSCODE_DIR/resources/app/out/cli.js"
 
 ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 VSCODE_PATH="$VSCODE_DIR/$ELECTRON_FILE" \
 	"$VSCODE_DIR/$ELECTRON_FILE" $VSCODE_LAUNCHER "$@"

src/cli.js

@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+require('./bootstrap-amd').bootstrap('vs/workbench/electron-main/cli');

src/vs/workbench/electron-main/cli.ts

@@ -0,0 +1,55 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as path from 'path';
+import * as fs from 'fs';
+import * as os from 'os';
+import { spawn } from 'child_process';
+import uri from 'vs/base/common/uri';
+
+const rootPath = path.dirname(uri.parse(require.toUrl('')).fsPath);
+const packageJsonPath = path.join(rootPath, 'package.json');
+const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+
+class ArgParser {
+
+	constructor(private argv: string[]) {}
+
+	hasFlag(flag, alias): boolean {
+		return (flag && this.argv.indexOf('--' + flag) >= 0)
+			|| (alias && this.argv.indexOf('-' + alias) >= 0);
+	}
+
+	help(): string {
+		const executable = 'code' + (os.platform() == 'win32' ? '.exe' : '');
+
+		return `Visual Studio Code v${ packageJson.version }
+
+Usage: ${ executable } [arguments] [paths...]
+
+Options:
+	-h, --help     Print usage.
+	--locale       Use a specific locale.
+	-n             Force a new instance of Code.
+	-v, --version  Print version.`;
+	}
+}
+
+export function main(argv: string[]) {
+	const argParser = new ArgParser(argv);
+
+	if (argParser.hasFlag('help', 'h')) {
+		console.log(argParser.help());
+	} else if (argParser.hasFlag('version', 'v')) {
+		console.log(packageJson.version);
+	} else {
+		delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'];
+		spawn(process.env['VSCODE_PATH'], process.argv.slice(2), { detached: true, stdio: 'ignore' });
+	}
+
+	process.exit(0);
+}
+
+main(process.argv.slice(2));