fix: use untildify to get ~/vcpkg

aminya · Nov 21, 2021 · 2c34e17 · 2c34e17
1 parent 08d77f1
commit 2c34e17
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/dist/setup_cpp.js b/dist/setup_cpp.js
diff --git a/dist/setup_cpp.js.map b/dist/setup_cpp.js.map
diff --git a/src/vcpkg/vcpkg.ts b/src/vcpkg/vcpkg.ts
@@ -1,5 +1,7 @@
 import { addPath } from "@actions/core"
 import execa from "execa"
+import path from "path"
+import untildify from "untildify"
 import which from "which"
 import { InstallationInfo } from "../utils/setup/setupBin"
 
@@ -8,11 +10,13 @@ let hasVCPKG = false
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export function setupVcpkg(_version: string, _setupCppDir: string, _arch: string): InstallationInfo {
   if (!hasVCPKG || which.sync("vcpkg", { nothrow: true }) === null) {
-    execa.sync("git", ["clone", "https://github.com/microsoft/vcpkg"], { cwd: "~/" })
-    execa.sync("./vcpkg/bootstrap-vcpkg", { cwd: "~/vcpkg" })
-    addPath("~/vcpkg")
+    execa.sync("git", ["clone", "https://github.com/microsoft/vcpkg"], { cwd: untildify("~/") })
+    const vcpkgDir = untildify("~/vcpkg")
+    execa.sync("./vcpkg/bootstrap-vcpkg", { cwd: vcpkgDir })
+    addPath(vcpkgDir)
     hasVCPKG = true
+    return { binDir: vcpkgDir }
   }
 
-  return { binDir: "~/vcpkg" }
+  return { binDir: path.dirname(which.sync("vcpkg")) }
 }