Skip to content

Commit 7a90ebc

Browse files
committed
fix: disable auto nala installation
1 parent ba21b20 commit 7a90ebc

File tree

6 files changed

+15
-20
lines changed

6 files changed

+15
-20
lines changed

dist/setup_cpp.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/setup_cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/setup_cpp.mjs

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

dist/setup_cpp.mjs.map

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/main.ts

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ import { addEnv } from "./utils/env/addEnv"
4343
import { setupSevenZip } from "./sevenzip/sevenzip"
4444
import { setupGraphviz } from "./graphviz/graphviz"
4545
import { setupNala } from "./nala/nala"
46-
import { isUbuntu } from "./utils/env/isUbuntu"
4746

4847
/** The setup functions */
4948
const setups = {
@@ -155,14 +154,16 @@ export async function main(args: string[]): Promise<number> {
155154
return 1
156155
}
157156

158-
if (isUbuntu()) {
159-
try {
160-
setupNala(getVersion("nala", undefined, osVersion), "", arch)
161-
} catch (err) {
162-
warning((err as Error).toString())
163-
// continue with apt-get
164-
}
165-
}
157+
// https://gitlab.com/volian/nala/-/issues/115
158+
//
159+
// if (isUbuntu()) {
160+
// try {
161+
// setupNala(getVersion("nala", undefined, osVersion), "", arch)
162+
// } catch (err) {
163+
// warning((err as Error).toString())
164+
// // continue with apt-get
165+
// }
166+
// }
166167

167168
// loop over the tools and run their setup function
168169
for (const tool of tools) {

src/nala/nala.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { dirname } from "path"
22
import which from "which"
33
import { isUbuntu } from "../utils/env/isUbuntu"
44
import { execSudo } from "../utils/exec/sudo"
5-
import { warning } from "../utils/io/io"
65
import { setupAptPack } from "../utils/setup/setupAptPack"
76

87
let binDir: string | undefined
@@ -23,12 +22,7 @@ export function setupNala(version: string, _setupDir: string, _arch: string) {
2322
}
2423

2524
// https://github.com/volitank/nala#-installation
26-
try {
27-
execSudo("apt-key", ["adv", "--keyserver", "keyserver.ubuntu.com", "--recv-keys", "A87015F3DA22D980"])
28-
} catch (err) {
29-
// https://gitlab.com/volian/nala/-/issues/115
30-
warning((err as Error).toString())
31-
}
25+
execSudo("apt-key", ["adv", "--keyserver", "keyserver.ubuntu.com", "--recv-keys", "A87015F3DA22D980"])
3226
execSudo("/bin/bash", [
3327
"-c",
3428
`echo "deb http://deb.volian.org/volian/ scar main" | tee /etc/apt/sources.list.d/volian-archive-scar-unstable.list`,

0 commit comments

Comments
 (0)