Merge remote-tracking branch 'origin/joao/portable-data'

1421f343 · Joao Moreno · a908be0a · e087b311 · 1421f343 · 1421f343
隐藏空白更改
内联并排

Showing with 28 addition and 4 deletion

src/cli.js src/cli.js +14 -2

src/main.js src/main.js +14 -2

未找到文件。
--- a/src/cli.js
+++ b/src/cli.js
@@ -20,8 +20,20 @@ function getApplicationPath() {
 	}
 }

-const portableDataName = product.portable || `${product.applicationName}-portable-data`;
-const portableDataPath = path.join(path.dirname(getApplicationPath()), portableDataName);
+function getPortableDataPath() {
+	if (process.env['VSCODE_PORTABLE']) {
+		return process.env['VSCODE_PORTABLE'];
+	}
+
+	if (process.platform === 'win32' || process.platform === 'linux') {
+		return path.join(getApplicationPath(), 'data');
+	} else {
+		const portableDataName = product.portable || `${product.applicationName}-portable-data`;
+		return path.join(path.dirname(getApplicationPath()), portableDataName);
+	}
+}
+
+const portableDataPath = getPortableDataPath();
 const isPortable = fs.existsSync(portableDataPath);
 const portableTempPath = path.join(portableDataPath, 'tmp');
 const isTempPortable = isPortable && fs.existsSync(portableTempPath);

--- a/src/main.js
+++ b/src/main.js
@@ -27,8 +27,20 @@ function getApplicationPath() {
 	}
 }

-const portableDataName = product.portable || `${product.applicationName}-portable-data`;
-const portableDataPath = process.env['VSCODE_PORTABLE'] || path.join(path.dirname(getApplicationPath()), portableDataName);
+function getPortableDataPath() {
+	if (process.env['VSCODE_PORTABLE']) {
+		return process.env['VSCODE_PORTABLE'];
+	}
+
+	if (process.platform === 'win32' || process.platform === 'linux') {
+		return path.join(getApplicationPath(), 'data');
+	} else {
+		const portableDataName = product.portable || `${product.applicationName}-portable-data`;
+		return path.join(path.dirname(getApplicationPath()), portableDataName);
+	}
+}
+
+const portableDataPath = getPortableDataPath();
 const isPortable = fs.existsSync(portableDataPath);
 const portableTempPath = path.join(portableDataPath, 'tmp');
 const isTempPortable = isPortable && fs.existsSync(portableTempPath);