fix: fix the powershell installation on Ubuntu

aminya · Aug 8, 2022 · fbd74e7 · fbd74e7
1 parent afa59a4
commit fbd74e7
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 10 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/dist/setup_cpp.mjs b/dist/setup_cpp.mjs
diff --git a/dist/setup_cpp.mjs.map b/dist/setup_cpp.mjs.map
diff --git a/src/powershell/powershell.ts b/src/powershell/powershell.ts
@@ -1,5 +1,5 @@
 import { addPath } from "../utils/env/addEnv"
-import { addAptKeyViaDownload, setupAptPack } from "../utils/setup/setupAptPack"
+import { setupAptPack } from "../utils/setup/setupAptPack"
 import { setupPacmanPack } from "../utils/setup/setupPacmanPack"
 import { setupBrewPack } from "../utils/setup/setupBrewPack"
 import { setupChocoPack } from "../utils/setup/setupChocoPack"
@@ -8,6 +8,7 @@ import { hasDnf } from "../utils/env/hasDnf"
 import { setupDnfPack } from "../utils/setup/setupDnfPack"
 import { isUbuntu } from "../utils/env/isUbuntu"
 import { execRootSync } from "root-tools"
+import { ubuntuVersion } from "../utils/env/ubuntu_version"
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export async function setupPowershell(version: string | undefined, _setupDir: string, _arch: string) {
@@ -32,14 +33,26 @@ export async function setupPowershell(version: string | undefined, _setupDir: st
         ])
         return setupDnfPack("powershell", version)
       } else if (isUbuntu()) {
-        const keyFileName = await addAptKeyViaDownload(
-          "microsoft.asc",
-          "https://packages.microsoft.com/keys/microsoft.asc"
-        )
+        setupDnfPack("curl")
+        const ubuntuVerSplitted = (await ubuntuVersion())!
+        const ubuntuVersionString = `${ubuntuVerSplitted[0]}.${ubuntuVerSplitted[1]}`
+
         execRootSync("/bin/bash", [
           "-c",
-          `echo "deb [arch=amd64 signed-by=${keyFileName}] https://packages.microsoft.com/repos/microsoft-debian-bullseye-prod bullseye main" > /etc/apt/sources.list.d/microsoft.list`,
+          `curl -LJO "https://packages.microsoft.com/config/ubuntu/${ubuntuVersionString}/packages-microsoft-prod.deb"`,
         ])
+        execRootSync("dpkg", ["-i", "packages-microsoft-prod.deb"])
+
+        // TODO Debian
+        // const keyFileName = await addAptKeyViaDownload(
+        //   "microsoft.asc",
+        //   "https://packages.microsoft.com/keys/microsoft.asc"
+        // )
+        // execRootSync("/bin/bash", [
+        //   "-c",
+        //   `echo "deb [arch=amd64 signed-by=${keyFileName}] https://packages.microsoft.com/repos/microsoft-debian-bullseye-prod bullseye main" > /etc/apt/sources.list.d/microsoft.list`,
+        // ])
+
         return setupAptPack("powershell", version, [], true)
       }
       throw new Error(`Unsupported linux distribution`)