fix: prefer apt-fast or apt over apt-get

Author: aminya

dist/legacy/setup-cpp.js

@@ -1,6 +1,6 @@
 {
   "name": "setup-apt",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "description": "Setup apt packages and repositories in Debian/Ubuntu-based distributions",
   "repository": "https://github.com/aminya/setup-cpp",
   "homepage": "https://github.com/aminya/setup-cpp/tree/master/packages/setup-apt",

dist/legacy/setup-cpp.js.map

@@ -7,16 +7,41 @@ export function hasNala() {
   return which.sync("nala", { nothrow: true }) !== null
 }
 
+/**
+ * Check if apt-fast is installed
+ */
+export function hasAptFast() {
+  return which.sync("apt-fast", { nothrow: true }) !== null
+}
+
+/**
+ * Check if apt is installed
+ */
+export function hasApt() {
+  return which.sync("apt", { nothrow: true }) !== null
+}
+
+/**
+ * Check if apt-get is installed
+ */
+export function hasAptGet() {
+  return which.sync("apt-get", { 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"
+    return "nala"
+  } else if (hasAptFast()) {
+    return "apt-fast"
+  } else if (hasApt()) {
+    return "apt"
+  } else if (hasAptGet()) {
+    return "apt-get"
   } else {
-    apt = "apt-get"
+    throw new Error("No apt command found")
   }
-  return apt
 }

dist/modern/setup-cpp.mjs

@@ -4,9 +4,8 @@ import { execRootSync } from "admina"
 import { error } from "ci-log"
 import { readFile, writeFile } from "fs/promises"
 import { DownloaderHelper } from "node-downloader-helper"
-import { installAptPack } from "setup-apt"
+import { hasAptGet, installAptPack } from "setup-apt"
 import which from "which"
-import { hasAptGet } from "../utils/env/hasAptGet.js"
 
 let binDir: string | undefined
 

dist/modern/setup-cpp.mjs.map

@@ -1,9 +1,8 @@
 import { execRoot } from "admina"
 import { hasApk, installApkPack } from "setup-alpine"
-import { addAptKeyViaURL, installAptPack } from "setup-apt"
+import { addAptKeyViaURL, hasAptGet, 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 { setupChocoPack } from "../utils/setup/setupChocoPack.js"

packages/setup-apt/package.json

@@ -1,7 +1,6 @@
 import { hasApk, installApkPack } from "setup-alpine"
-import { installAptPack } from "setup-apt"
+import { hasAptGet, 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 { setupChocoPack } from "../utils/setup/setupChocoPack.js"

packages/setup-apt/src/get-apt.ts

@@ -1,9 +1,8 @@
 import { addPath } from "envosman"
 import { hasApk, installApkPack } from "setup-alpine"
-import { installAptPack } from "setup-apt"
+import { hasAptGet, 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 { setupChocoPack } from "../utils/setup/setupChocoPack.js"