fix: rename isUbuntu to hasAptget

Author: aminya

dist/legacy/setup-cpp.js

@@ -3,9 +3,9 @@ import { hasApk, installApkPack } from "setup-alpine"
 import { addAptKeyViaURL, installAptPack } from "setup-apt"
 import { installBrewPack } from "setup-brew"
 import { getDebArch } from "../utils/env/arch.js"
+import { hasAptGet } from "../utils/env/hasAptGet.js"
 import { hasDnf } from "../utils/env/hasDnf.js"
 import { isArch } from "../utils/env/isArch.js"
-import { isUbuntu } from "../utils/env/isUbuntu.js"
 import { setupChocoPack } from "../utils/setup/setupChocoPack.js"
 import { setupDnfPack } from "../utils/setup/setupDnfPack.js"
 
@@ -28,7 +28,7 @@ export async function setupBazel(version: string, _setupDir: string, _arch: stri
         await setupDnfPack([{ name: "dnf-plugins-core" }])
         await execRoot("dnf", ["copr", "enable", "vbatts/bazel"])
         return setupDnfPack([{ name: "bazel4" }])
-      } else if (isUbuntu()) {
+      } else if (hasAptGet()) {
         // https://bazel.build/install/ubuntu
         const keyFileName = await addAptKeyViaURL({
           fileName: "bazel-archive-keyring.gpg",

dist/legacy/setup-cpp.js.map

@@ -1,9 +1,9 @@
 import { hasApk, installApkPack } from "setup-alpine"
 import { installAptPack } from "setup-apt"
 import { installBrewPack } from "setup-brew"
+import { hasAptGet } from "../utils/env/hasAptGet.js"
 import { hasDnf } from "../utils/env/hasDnf.js"
 import { isArch } from "../utils/env/isArch.js"
-import { isUbuntu } from "../utils/env/isUbuntu.js"
 import { setupChocoPack } from "../utils/setup/setupChocoPack.js"
 import { setupDnfPack } from "../utils/setup/setupDnfPack.js"
 import { setupPacmanPack } from "../utils/setup/setupPacmanPack.js"
@@ -22,7 +22,7 @@ export async function setupCcache(version: string, _setupDir: string, _arch: str
         return setupPacmanPack("ccache", version)
       } else if (hasDnf()) {
         return setupDnfPack([{ name: "ccache", version }])
-      } else if (isUbuntu()) {
+      } else if (hasAptGet()) {
         return installAptPack([{ name: "ccache", version }])
       } else if (await hasApk()) {
         return installApkPack([{ name: "ccache", version }])

dist/modern/setup-cpp.mjs

@@ -3,9 +3,9 @@ import { hasApk, installApkPack } from "setup-alpine"
 import { installAptPack } from "setup-apt"
 import { installBrewPack } from "setup-brew"
 import { rcOptions } from "../options.js"
+import { hasAptGet } from "../utils/env/hasAptGet.js"
 import { hasDnf } from "../utils/env/hasDnf.js"
 import { isArch } from "../utils/env/isArch.js"
-import { isUbuntu } from "../utils/env/isUbuntu.js"
 import { setupChocoPack } from "../utils/setup/setupChocoPack.js"
 import { setupDnfPack } from "../utils/setup/setupDnfPack.js"
 import { setupPacmanPack } from "../utils/setup/setupPacmanPack.js"
@@ -26,7 +26,7 @@ export async function setupCppcheck(version: string | undefined, _setupDir: stri
         return setupPacmanPack("cppcheck", version)
       } else if (hasDnf()) {
         return setupDnfPack([{ name: "ccache", version }])
-      } else if (isUbuntu()) {
+      } else if (hasAptGet()) {
         return installAptPack([{ name: "cppcheck", version }])
       } else if (await hasApk()) {
         return installApkPack([{ name: "cppcheck", version }])

dist/modern/setup-cpp.mjs.map

@@ -10,9 +10,9 @@ import { installBrewPack } from "setup-brew"
 import { setupGraphviz } from "../graphviz/graphviz.js"
 import { rcOptions } from "../options.js"
 import { arm64 } from "../utils/env/arch.js"
+import { hasAptGet } from "../utils/env/hasAptGet.js"
 import { hasDnf } from "../utils/env/hasDnf.js"
 import { isArch } from "../utils/env/isArch.js"
-import { isUbuntu } from "../utils/env/isUbuntu.js"
 import { macosVersion } from "../utils/env/macos_version.js"
 import { ubuntuVersion } from "../utils/env/ubuntu_version.js"
 import { type PackageInfo, setupBin } from "../utils/setup/setupBin.js"
@@ -109,7 +109,7 @@ async function setupLinuxDoxygen(version: string, setupDir: string, arch: string
       return await setupPacmanPack("doxygen", version)
     } else if (hasDnf()) {
       return setupDnfPack([{ name: "doxygen", version }])
-    } else if (isUbuntu()) {
+    } else if (hasAptGet()) {
       return await installAptPack([{ name: "doxygen", version, fallBackToLatest: arm64.includes(arch) }])
     } else if (await hasApk()) {
       return installApkPack([
@@ -125,7 +125,7 @@ async function setupLinuxDoxygen(version: string, setupDir: string, arch: string
     // fallback to setupBin if the installation failed
     try {
       const installationInfo = await setupBin("doxygen", version, getDoxygenPackageInfo, setupDir, arch)
-      if (isUbuntu()) {
+      if (hasAptGet()) {
         try {
           await installAptPack([{ name: "libclang-cpp-dev" }])
         } catch (err) {

src/bazel/bazel.ts

@@ -3,7 +3,7 @@ import { fileURLToPath } from "url"
 import { execaSync } from "execa"
 import { chmod } from "fs/promises"
 import { addExeExt } from "patha"
-import { isUbuntu } from "../../utils/env/isUbuntu.js"
+import { hasAptGet } from "../../utils/env/hasAptGet.js"
 import { ubuntuVersion } from "../../utils/env/ubuntu_version.js"
 import { cleanupTmpDir, setupTmpDir, testBin } from "../../utils/tests/test-helpers.js"
 import { getVersion } from "../../versions/versions.js"
@@ -24,7 +24,7 @@ describe("setup-gcc", () => {
     const installInfo = await setupGcc(version, directory, process.arch)
 
     let gpp = "g++"
-    if (isUbuntu()) {
+    if (hasAptGet()) {
       const ubuntuMajorVersion = ubuntuVersionOutput?.[0]
       // https://packages.ubuntu.com/search?keywords=gcc
       switch (ubuntuMajorVersion) {

src/ccache/ccache.ts

@@ -15,9 +15,9 @@ import { addUpdateAlternativesToRc, installAptPack } from "setup-apt"
 import { installBrewPack } from "setup-brew"
 import { setupMacOSSDK } from "../macos-sdk/macos-sdk.js"
 import { rcOptions } from "../options.js"
+import { hasAptGet } from "../utils/env/hasAptGet.js"
 import { hasDnf } from "../utils/env/hasDnf.js"
 import { isArch } from "../utils/env/isArch.js"
-import { isUbuntu } from "../utils/env/isUbuntu.js"
 import type { InstallationInfo } from "../utils/setup/setupBin.js"
 import { setupDnfPack } from "../utils/setup/setupDnfPack.js"
 import { setupPacmanPack } from "../utils/setup/setupPacmanPack.js"
@@ -49,7 +49,7 @@ export async function setupGcc(version: string, setupDir: string, arch: string,
         ])
       } else if (await hasApk()) {
         installationInfo = await installApkPack([{ name: "gcc", version }, { name: "g++", version }])
-      } else if (isUbuntu()) {
+      } else if (hasAptGet()) {
         if (version === "") {
           // the default version
           installationInfo = await installAptPack([{ name: "gcc" }, { name: "g++" }])
@@ -156,7 +156,7 @@ async function activateGcc(givenVersion: string, binDir: string, priority: numbe
       addEnv("CXX", gxxPath, rcOptions),
     )
 
-    if (isUbuntu()) {
+    if (hasAptGet()) {
       promises.push(
         addUpdateAlternativesToRc("cc", gccPath, rcOptions, priority),
         addUpdateAlternativesToRc("cxx", gxxPath, rcOptions, priority),