Skip to content

Commit 5d3ac21

Browse files
committed
fix: fix double doxygen installation on ubuntu 18
1 parent d1458aa commit 5d3ac21

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
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.

src/doxygen/doxygen.ts

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,15 @@ export async function setupDoxygen(version: string, setupDir: string, arch: stri
5858
let installationInfo: InstallationInfo
5959
if (version === "") {
6060
installationInfo = setupAptPack("doxygen", undefined)
61-
}
62-
try {
63-
// doxygen on stable Ubuntu repositories is very old. So, we use get the binary from the website itself
64-
installationInfo = await setupBin("doxygen", version, getDoxygenPackageInfo, setupDir, arch)
65-
setupAptPack("libclang-cpp9")
66-
} catch (err) {
67-
notice(`Failed to download doxygen binary. ${err}. Falling back to apt-get.`)
68-
installationInfo = setupAptPack("doxygen", undefined)
61+
} else {
62+
try {
63+
// doxygen on stable Ubuntu repositories is very old. So, we use get the binary from the website itself
64+
installationInfo = await setupBin("doxygen", version, getDoxygenPackageInfo, setupDir, arch)
65+
setupAptPack("libclang-cpp9")
66+
} catch (err) {
67+
notice(`Failed to download doxygen binary. ${err}. Falling back to apt-get.`)
68+
installationInfo = setupAptPack("doxygen", undefined)
69+
}
6970
}
7071
await setupGraphviz(getVersion("graphviz", undefined), "", arch)
7172
return installationInfo

0 commit comments

Comments
 (0)