fix: refactor apt functions into separate files

Author: aminya

dist/actions/setup-cpp.js

@@ -0,0 +1,21 @@
+/**
+ * Get the environment variables to use for the apt command
+ * @param apt The apt command to use
+ * @private Used internally
+ */
+
+export function getAptEnv(apt: string) {
+  const env: NodeJS.ProcessEnv = { ...process.env, DEBIAN_FRONTEND: "noninteractive" }
+
+  if (apt === "nala") {
+    // if LANG/LC_ALL is not set, enable utf8 otherwise nala fails because of ASCII encoding
+    if (env.LANG === undefined) {
+      env.LANG = "C.UTF-8"
+    }
+    if (env.LC_ALL === undefined) {
+      env.LC_ALL = "C.UTF-8"
+    }
+  }
+
+  return env
+}

dist/actions/setup-cpp.js.map

@@ -0,0 +1,23 @@
+import { defaultExecOptions, execRootSync } from "admina"
+import { getAptEnv } from "./apt-env.js"
+import { aptTimeout } from "./apt-timeout.js"
+import { getApt } from "./get-apt.js"
+import { isAptPackInstalled } from "./is-installed.js"
+import { updateAptRepos } from "./update.js"
+
+export async function addAptRepository(repo: string, apt = getApt()) {
+  await installAddAptRepo(apt)
+  execRootSync("add-apt-repository", ["-y", "--no-update", repo], { ...defaultExecOptions, env: getAptEnv(apt) })
+  updateAptRepos(apt)
+}
+
+export async function installAddAptRepo(apt: string) {
+  if (await isAptPackInstalled("software-properties-common")) {
+    return
+  }
+  execRootSync(
+    apt,
+    ["install", "-y", "--fix-broken", "-o", aptTimeout, "software-properties-common"],
+    { ...defaultExecOptions, env: getAptEnv(apt) },
+  )
+}

dist/legacy/setup-cpp.js

@@ -0,0 +1,7 @@
+/**
+ * The timeout to use for apt commands
+ * Wait up to 300 seconds if the apt-get lock is held
+ * @private Used internally
+ */
+
+export const aptTimeout = "Dpkg::Lock::Timeout=300"

dist/legacy/setup-cpp.js.map

@@ -0,0 +1,22 @@
+import which from "which"
+
+/**
+ * Check if nala is installed
+ */
+export function hasNala() {
+  return which.sync("nala", { nothrow: true }) !== null
+}
+
+/**
+ * Get the apt command to use
+ * If nala is installed, use that, otherwise use apt-get
+ */
+export function getApt() {
+  let apt: string
+  if (hasNala()) {
+    apt = "nala"
+  } else {
+    apt = "apt-get"
+  }
+  return apt
+}