From 1ddb528d214122f5b657b2897b0ce6aa181705ae Mon Sep 17 00:00:00 2001 From: "eryn L. K" Date: Fri, 1 Jul 2022 23:34:48 -0400 Subject: [PATCH] Remove platform specific install warning --- package-lock.json | 4 ++-- package.json | 2 +- src/installRojo.ts | 42 +++++++++--------------------------------- 3 files changed, 12 insertions(+), 36 deletions(-) diff --git a/package-lock.json b/package-lock.json index 09b5067..bf195e5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vscode-rojo", - "version": "2.0.0-alpha.2", + "version": "2.0.0-alpha.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vscode-rojo", - "version": "2.0.0-alpha.2", + "version": "2.0.0-alpha.3", "devDependencies": { "@types/glob": "^7.1.4", "@types/node": "14.x", diff --git a/package.json b/package.json index 5e9c34a..bc57dc1 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-rojo", "displayName": "Rojo - Roblox Studio Sync", "description": "Rojo for VS Code", - "version": "2.0.0-alpha.2", + "version": "2.0.0-alpha.3", "repository": "https://github.com/rojo-rbx/vscode-rojo", "publisher": "evaera", "engines": { diff --git a/src/installRojo.ts b/src/installRojo.ts index aeca356..53eff14 100644 --- a/src/installRojo.ts +++ b/src/installRojo.ts @@ -168,40 +168,16 @@ export async function installRojo(folder: string) { await exec(`${tempPath} self-install`) - if (os.platform() === "win32") { - vscode.window.showInformationMessage( - "Successfully installed Aftman on your system. " + - "It has been added to your system PATH, and is usable from the command line if needed. " - ) - } else { - vscode.window - .showWarningMessage( - "[User Action Required] Aftman was installed to `~/.aftman/bin`. " + - "You MUST add this folder to your system path, and restart VS Code, before continuing. " + - 'Click the button below and read the "Aftman bin on Non-Windows platforms" section' + - " of the README if you need help.", - "Open README" - ) - .then((response) => { - if (!response) { - return - } - - vscode.env.openExternal( - vscode.Uri.from({ - scheme: vscode.env.uriScheme, - path: "extension/evaera.vscode-rojo", - }) - ) - }) - return - } - } + vscode.window.showInformationMessage( + "Successfully installed Aftman on your system. " + + "It has been added to your system PATH, and is usable from the command line if needed. " + ) - if ("PATH" in process.env) { - const envPath = process.env.PATH!.split(path.delimiter) - envPath.push(path.join(os.homedir(), ".aftman", "bin")) - process.env.PATH = envPath.join(path.delimiter) + if ("PATH" in process.env) { + const envPath = process.env.PATH!.split(path.delimiter) + envPath.push(path.join(os.homedir(), ".aftman", "bin")) + process.env.PATH = envPath.join(path.delimiter) + } } await exec("aftman trust rojo-rbx/rojo", {