fix: rename installApkPack for consistency

packages/setup-alpine/src/install-package.ts

@@ -23,7 +23,7 @@ export type InstallationInfo = {
  * @param update Whether to update the package index before installing
  * @returns The installation information
  */
-export async function installApkPackage(packages: ApkPackage[], update = false): Promise<InstallationInfo> {
+export async function installApkPack(packages: ApkPackage[], update = false): Promise<InstallationInfo> {
   // Check if apk is available
   if (!(await hasApk())) {
     throw new Error("apk is not available on this system")

src/bazel/bazel.ts

@@ -1,5 +1,5 @@
 import { execRoot } from "admina"
-import { hasApk, installApkPackage } from "setup-alpine"
+import { hasApk, installApkPack } from "setup-alpine"
 import { addAptKeyViaURL, installAptPack } from "setup-apt"
 import { installBrewPack } from "setup-brew"
 import { getDebArch } from "../utils/env/arch.js"
@@ -42,7 +42,7 @@ export async function setupBazel(version: string, _setupDir: string, _arch: stri
         ])
         return installAptPack([{ name: "bazel", version }], true)
       } else if (await hasApk()) {
-        return installApkPackage([{ name: "bazel", version }], true)
+        return installApkPack([{ name: "bazel", version }], true)
       }
       throw new Error("Unsupported linux distribution")
     }

src/ccache/ccache.ts

@@ -1,4 +1,4 @@
-import { hasApk, installApkPackage } from "setup-alpine"
+import { hasApk, installApkPack } from "setup-alpine"
 import { installAptPack } from "setup-apt"
 import { installBrewPack } from "setup-brew"
 import { hasDnf } from "../utils/env/hasDnf.js"
@@ -25,7 +25,7 @@ export async function setupCcache(version: string, _setupDir: string, _arch: str
       } else if (isUbuntu()) {
         return installAptPack([{ name: "ccache", version }])
       } else if (await hasApk()) {
-        return installApkPackage([{ name: "ccache", version }])
+        return installApkPack([{ name: "ccache", version }])
       }
       throw new Error("Unsupported linux distribution")
     }

src/cppcheck/cppcheck.ts

@@ -1,5 +1,5 @@
 import { addPath } from "envosman"
-import { hasApk, installApkPackage } from "setup-alpine"
+import { hasApk, installApkPack } from "setup-alpine"
 import { installAptPack } from "setup-apt"
 import { installBrewPack } from "setup-brew"
 import { rcOptions } from "../cli-options.js"
@@ -29,7 +29,7 @@ export async function setupCppcheck(version: string | undefined, _setupDir: stri
       } else if (isUbuntu()) {
         return installAptPack([{ name: "cppcheck", version }])
       } else if (await hasApk()) {
-        return installApkPackage([{ name: "cppcheck", version }])
+        return installApkPack([{ name: "cppcheck", version }])
       }
       throw new Error("Unsupported linux distribution")
     }

src/doxygen/doxygen.ts

@@ -4,7 +4,7 @@ import { addPath } from "envosman"
 import { pathExists } from "path-exists"
 import { addExeExt } from "patha"
 import retry from "retry-as-promised"
-import { hasApk, installApkPackage } from "setup-alpine"
+import { hasApk, installApkPack } from "setup-alpine"
 import { installAptPack } from "setup-apt"
 import { installBrewPack } from "setup-brew"
 import { rcOptions } from "../cli-options.js"
@@ -112,7 +112,7 @@ async function setupLinuxDoxygen(version: string, setupDir: string, arch: string
     } else if (isUbuntu()) {
       return await installAptPack([{ name: "doxygen", version, fallBackToLatest: arm64.includes(arch) }])
     } else if (await hasApk()) {
-      return installApkPackage([{ name: "doxygen", version }])
+      return installApkPack([{ name: "doxygen", version }])
     } else {
       throw new Error("Unsupported linux distributions")
     }

src/gcc/gcc.ts

@@ -10,7 +10,7 @@ import { readdir } from "fs/promises"
 import { pathExists } from "path-exists"
 import { addExeExt } from "patha"
 import semverMajor from "semver/functions/major"
-import { hasApk, installApkPackage } from "setup-alpine"
+import { hasApk, installApkPack } from "setup-alpine"
 import { addUpdateAlternativesToRc, installAptPack } from "setup-apt"
 import { installBrewPack } from "setup-brew"
 import { rcOptions } from "../cli-options.js"
@@ -48,7 +48,7 @@ export async function setupGcc(version: string, setupDir: string, arch: string,
           { name: "libstdc++-devel" },
         ])
       } else if (await hasApk()) {
-        installationInfo = await installApkPackage([{ name: "gcc", version }, { name: "g++", version }])
+        installationInfo = await installApkPack([{ name: "gcc", version }, { name: "g++", version }])
       } else if (isUbuntu()) {
         if (version === "") {
           // the default version

src/gcc/mingw.ts

@@ -8,7 +8,7 @@ import { pathExists } from "path-exists"
 import { addExeExt } from "patha"
 import semverCoerce from "semver/functions/coerce.js"
 import semverSatisfies from "semver/functions/satisfies.js"
-import { hasApk, installApkPackage } from "setup-alpine"
+import { hasApk, installApkPack } from "setup-alpine"
 import { installAptPack } from "setup-apt"
 import { rcOptions } from "../cli-options.js"
 import { loadAssetList, matchAsset } from "../utils/asset/load-assets.js"
@@ -47,7 +47,7 @@ export async function setupMingw(version: string, setupDir: string, arch: string
       } else if (isUbuntu()) {
         installationInfo = await installAptPack([{ name: "mingw-w64", version }])
       } else if (await hasApk()) {
-        installationInfo = await installApkPackage([{ name: "mingw-w64", version }])
+        installationInfo = await installApkPack([{ name: "mingw-w64", version }])
       } else {
         throw new Error(`Unsupported Linux distro for ${arch}`)
       }

src/git/git.ts

@@ -1,7 +1,7 @@
 import { existsSync } from "fs"
 import { info, warning } from "ci-log"
 import { addPath } from "envosman"
-import { hasApk, installApkPackage } from "setup-alpine"
+import { hasApk, installApkPack } from "setup-alpine"
 import { installAptPack } from "setup-apt"
 import { installBrewPack } from "setup-brew"
 import which from "which"
@@ -41,7 +41,7 @@ export async function setupGit(version: string, _setupDir: string, _arch: string
       } else if (isUbuntu()) {
         return installAptPack([{ name: "git", version }])
       } else if (await hasApk()) {
-        return installApkPackage([{ name: "git", version }])
+        return installApkPack([{ name: "git", version }])
       }
       throw new Error("Unsupported linux distribution")
     }

src/graphviz/graphviz.ts

@@ -1,5 +1,5 @@
 import { addPath } from "envosman"
-import { hasApk, installApkPackage } from "setup-alpine"
+import { hasApk, installApkPack } from "setup-alpine"
 import { installAptPack } from "setup-apt"
 import { installBrewPack } from "setup-brew"
 import { rcOptions } from "../cli-options.js"
@@ -29,7 +29,7 @@ export async function setupGraphviz(version: string, _setupDir: string, _arch: s
       } else if (isUbuntu()) {
         return installAptPack([{ name: "graphviz", version }])
       } else if (await hasApk()) {
-        return installApkPackage([{ name: "graphviz", version }])
+        return installApkPack([{ name: "graphviz", version }])
       }
       throw new Error("Unsupported linux distribution")
     }

src/llvm/llvm_apk_installer.ts

@@ -2,7 +2,7 @@ import path, { join } from "path"
 import { fileURLToPath } from "url"
 import { execRootSync } from "admina"
 import { info } from "ci-log"
-import { type InstallationInfo, hasApk, installApkPackage } from "setup-alpine"
+import { type InstallationInfo, hasApk, installApkPack } from "setup-alpine"
 import { majorLLVMVersion } from "./utils.ts"
 
 const dirname = typeof __dirname === "string" ? __dirname : path.dirname(fileURLToPath(import.meta.url))
@@ -36,5 +36,5 @@ export async function trySetupLLVMApk(
 }
 
 export function setupLLVMApk(version: string): Promise<InstallationInfo> {
-  return installApkPackage([{ name: "llvm", version }])
+  return installApkPack([{ name: "llvm", version }])
 }

src/make/make.ts

@@ -1,6 +1,6 @@
 import { join } from "path"
 import { addPath } from "envosman"
-import { hasApk, installApkPackage } from "setup-alpine"
+import { hasApk, installApkPack } from "setup-alpine"
 import { installAptPack } from "setup-apt"
 import { getBrewDir, installBrewPack } from "setup-brew"
 import { rcOptions } from "../cli-options.js"
@@ -32,7 +32,7 @@ export async function setupMake(version: string, _setupDir: string, _arch: strin
       } else if (isUbuntu()) {
         return installAptPack([{ name: "make", version }])
       } else if (await hasApk()) {
-        return installApkPackage([{ name: "make", version }])
+        return installApkPack([{ name: "make", version }])
       }
       throw new Error("Unsupported linux distribution")
     }

src/powershell/powershell.ts

@@ -2,7 +2,7 @@ import { execRootSync } from "admina"
 import { error } from "ci-log"
 import { addPath } from "envosman"
 import { addExeExt } from "patha"
-import { hasApk, installApkPackage } from "setup-alpine"
+import { hasApk, installApkPack } from "setup-alpine"
 import { installAptPack } from "setup-apt"
 import { installBrewPack } from "setup-brew"
 import { rcOptions } from "../cli-options.js"
@@ -115,7 +115,7 @@ export async function setupPowershellSystem(version: string | undefined, _setupD
 
         return installAptPack([{ name: "powershell", version }], true)
       } else if (await hasApk()) {
-        return installApkPackage([{ name: "powershell", version }])
+        return installApkPack([{ name: "powershell", version }])
       }
       throw new Error("Unsupported linux distribution")
     }

src/python/python.ts

@@ -10,7 +10,7 @@ import { execa } from "execa"
 import { readdir } from "fs/promises"
 import { pathExists } from "path-exists"
 import { addExeExt } from "patha"
-import { hasApk, installApkPackage } from "setup-alpine"
+import { hasApk, installApkPack } from "setup-alpine"
 import { installAptPack, isAptPackInstalled } from "setup-apt"
 import { installBrewPack } from "setup-brew"
 import which from "which"
@@ -234,7 +234,7 @@ async function setupPythonSystem(setupDir: string, version: string) {
       } else if (isUbuntu()) {
         installInfo = await installAptPack([{ name: "python3", version }, { name: "python-is-python3" }])
       } else if (await hasApk()) {
-        installInfo = await installApkPackage([{ name: "python3", version }])
+        installInfo = await installApkPack([{ name: "python3", version }])
       } else {
         throw new Error("Unsupported linux distributions")
       }

src/sccache/sccache.ts

@@ -1,4 +1,4 @@
-import { hasApk, installApkPackage } from "setup-alpine"
+import { hasApk, installApkPack } from "setup-alpine"
 import { installAptPack } from "setup-apt"
 import { installBrewPack } from "setup-brew"
 import { getUbuntuVersion } from "ubuntu-version"
@@ -18,7 +18,7 @@ export async function setupSccache(version: string, _setupDir: string, _arch: st
           return installAptPack([{ name: "sccache", version }])
         }
       } else if (await hasApk()) {
-        return installApkPackage([{ name: "sccache", version }])
+        return installApkPack([{ name: "sccache", version }])
       }
 
       return installBrewPack("sccache", version)

src/sevenzip/sevenzip.ts

@@ -1,4 +1,4 @@
-import { hasApk, installApkPackage } from "setup-alpine"
+import { hasApk, installApkPack } from "setup-alpine"
 import { installAptPack } from "setup-apt"
 import { installBrewPack } from "setup-brew"
 import { hasDnf } from "../utils/env/hasDnf.js"
@@ -28,7 +28,7 @@ export async function setupSevenZip(version: string, _setupDir: string, _arch: s
       } else if (isUbuntu()) {
         return installAptPack([{ name: "p7zip-full", version }])
       } else if (await hasApk()) {
-        return installApkPackage([{ name: "p7zip", version }])
+        return installApkPack([{ name: "p7zip", version }])
       }
       throw new Error("Unsupported linux distribution")
     }

src/utils/setup/setupPipPack.ts

@@ -8,7 +8,7 @@ import memoize from "memoizee"
 import { mkdirp } from "mkdirp"
 import { pathExists } from "path-exists"
 import { addExeExt } from "patha"
-import { hasApk, installApkPackage } from "setup-alpine"
+import { hasApk, installApkPack } from "setup-alpine"
 import { installAptPack } from "setup-apt"
 import { installBrewPack } from "setup-brew"
 import { untildifyUser } from "untildify-user"
@@ -295,7 +295,7 @@ export async function setupPipPackSystem(name: string, givenAddPythonPrefix?: bo
     } else if (isUbuntu()) {
       return installAptPack([{ name: addPythonPrefix ? `python3-${name}` : name }])
     } else if (await hasApk()) {
-      return installApkPackage([{ name: addPythonPrefix ? `py3-${name}` : name }])
+      return installApkPack([{ name: addPythonPrefix ? `py3-${name}` : name }])
     }
   } else if (process.platform === "darwin") {
     // brew doesn't have venv

src/vcpkg/vcpkg.ts

@@ -5,7 +5,7 @@ import { addEnv, addPath } from "envosman"
 import { execa } from "execa"
 import { pathExists } from "path-exists"
 import { addShExt, addShRelativePrefix } from "patha"
-import { hasApk, installApkPackage } from "setup-alpine"
+import { hasApk, installApkPack } from "setup-alpine"
 import { installAptPack } from "setup-apt"
 import which from "which"
 import { rcOptions } from "../cli-options.js"
@@ -56,7 +56,7 @@ export async function setupVcpkg(version: string, setupDir: string, arch: string
         { name: "pkg-config" },
       ])
     } else if (await hasApk()) {
-      await installApkPackage([
+      await installApkPack([
         { name: "curl" },
         { name: "zip" },
         { name: "unzip" },