fix: fix add-apt-repository in Debian

Author: aminya

dist/legacy/llvm_repo_remove.bash

@@ -143,5 +143,5 @@ if [[ "${VERSION_CODENAME}" == "bookworm" ]]; then
     add-apt-repository -y "${REPO_NAME}"
 fi
 
-add-apt-repository -y --no-update --remove "${REPO_NAME}"
+add-apt-repository -y --remove "${REPO_NAME}"
 apt-get update

dist/legacy/setup-cpp.js

@@ -143,5 +143,5 @@ if [[ "${VERSION_CODENAME}" == "bookworm" ]]; then
     add-apt-repository -y "${REPO_NAME}"
 fi
 
-add-apt-repository -y --no-update --remove "${REPO_NAME}"
+add-apt-repository -y --remove "${REPO_NAME}"
 apt-get update

dist/legacy/setup-cpp.js.map

@@ -1,6 +1,6 @@
 {
   "name": "setup-apt",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "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/modern/llvm_repo_remove.bash

@@ -1,15 +1,30 @@
 import { defaultExecOptions, execRootSync } from "admina"
+import memoize from "memoizee"
 import { getAptEnv } from "./apt-env.js"
 import { aptTimeout } from "./apt-timeout.js"
 import { getApt } from "./get-apt.js"
 import { initAptMemoized } from "./init-apt.js"
 import { isAptPackInstalled } from "./is-installed.js"
 import { updateAptReposMemoized } from "./update.js"
 
+function hasNoUpdateFlag_(apt: string) {
+  const { stdout } = execRootSync("add-apt-repository", ["--help"], {
+    ...defaultExecOptions,
+    env: getAptEnv(apt),
+    stdio: "pipe",
+  })
+  return stdout.includes("--no-update")
+}
+const hasNoUpdateFlag = memoize(hasNoUpdateFlag_)
+
 export async function addAptRepository(repo: string, apt = getApt()) {
   await initAptMemoized(apt)
   await installAddAptRepo()
-  execRootSync("add-apt-repository", ["-y", "--no-update", repo], { ...defaultExecOptions, env: getAptEnv(apt) })
+  execRootSync(
+    "add-apt-repository",
+    ["-y", hasNoUpdateFlag(apt) ? "--no-update" : undefined, repo].filter(a => a !== undefined),
+    { ...defaultExecOptions, env: getAptEnv(apt) },
+  )
 
   // Update the repos
   updateAptReposMemoized.clear() // ensure update is called
@@ -31,10 +46,11 @@ export async function installAddAptRepo() {
 export async function removeAptRepository(repo: string, apt = getApt()) {
   await initAptMemoized(apt)
   await installAddAptRepo()
-  execRootSync("add-apt-repository", ["-y", "--no-update", "--remove", repo], {
-    ...defaultExecOptions,
-    env: getAptEnv(apt),
-  })
+  execRootSync(
+    "add-apt-repository",
+    ["-y", "--remove", hasNoUpdateFlag(apt) ? undefined : "--no-update", repo].filter(a => a !== undefined),
+    { ...defaultExecOptions, env: getAptEnv(apt) },
+  )
 
   // Update the repos
   updateAptReposMemoized.clear() // ensure update is called

dist/modern/setup-cpp.mjs

@@ -1,4 +1,5 @@
 import { existsSync } from "fs"
+import { join } from "path"
 import { info, warning } from "ci-log"
 import { addPath } from "envosman"
 import { hasApk, installApkPack } from "setup-alpine"
@@ -12,7 +13,6 @@ 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"
-import { join } from "path"
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export async function setupGit(version: string, _setupDir: string, _arch: string) {

dist/modern/setup-cpp.mjs.map

@@ -143,5 +143,5 @@ if [[ "${VERSION_CODENAME}" == "bookworm" ]]; then
     add-apt-repository -y "${REPO_NAME}"
 fi
 
-add-apt-repository -y --no-update --remove "${REPO_NAME}"
+add-apt-repository -y --remove "${REPO_NAME}"
 apt-get update