Update process path after installing aftman

rojo-rbx · May 24, 2022 · c794a76 · c794a76
1 parent 53fce39
commit c794a76
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/commands/serveRecent.ts b/src/commands/serveRecent.ts
@@ -1,6 +1,7 @@
 import * as path from "path"
 import * as vscode from "vscode"
 import { State } from "../extension"
+import { getRojoInstall } from "../getRojoInstall"
 import { serveProject } from "../serveProject"
 
 export const serveRecentCommand = (state: State) =>
@@ -18,11 +19,17 @@ export const serveRecentCommand = (state: State) =>
         const workspaceFolder = vscode.workspace.getWorkspaceFolder(uri)
 
         if (workspaceFolder) {
-          return serveProject(state, {
+          const projectFile = {
             name: path.basename(lastFilePath),
             workspaceFolderName: workspaceFolder.name,
             path: uri,
-          })
+          }
+
+          const install = await getRojoInstall(projectFile)
+
+          if (install) {
+            return serveProject(state, projectFile)
+          }
         }
       } catch (e) {
         // fall through

diff --git a/src/installRojo.ts b/src/installRojo.ts
@@ -198,6 +198,12 @@ export async function installRojo(folder: string) {
     }
   }
 
+  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", {
     cwd: folder,
   })