diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopService.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopService.kt index 1080535..778e341 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopService.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopService.kt @@ -86,7 +86,7 @@ fun Prov.provisionIdeDesktop(onlyModules: List? = null) { } else if (onlyModules.contains(DesktopOnlyModule.VERIFY.name.lowercase())) { verifyIdeSetup() } else if (onlyModules.contains(DesktopOnlyModule.FIREFOX.name.lowercase())) { - installFirefox() + installPpaFirefox() } } @@ -109,7 +109,7 @@ fun Prov.provisionOfficeDesktop(onlyModules: List? = null) { } else if (onlyModules.contains(DesktopOnlyModule.VERIFY.name.lowercase())) { verifyOfficeSetup() } else if (onlyModules.contains(DesktopOnlyModule.FIREFOX.name.lowercase())) { - installFirefox() + installPpaFirefox() } } @@ -140,7 +140,7 @@ fun Prov.provisionBasicDesktop( provisionKeys(gpg, ssh) provisionGit(gitUserName ?: whoami(), gitEmail, gpg?.let { gpgFingerprint(it.publicKey.plain()) }) - installFirefox() + installPpaFirefox() installGopass() configureGopass(publicGpgKey = gpg?.publicKey) installGopassJsonApi() @@ -153,6 +153,6 @@ fun Prov.provisionBasicDesktop( configureBash() installVirtualBoxGuestAdditions() } else if (onlyModules.contains(DesktopOnlyModule.FIREFOX.name.lowercase())) { - installFirefox() + installPpaFirefox() } } diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Firefox.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Firefox.kt index 6ce584a..7056fe5 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Firefox.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Firefox.kt @@ -9,7 +9,7 @@ import java.io.File /** * Installs non-snap firefox, removing a firefox snap-installation if existing */ -fun Prov.installFirefox() = task { +fun Prov.installPpaFirefox() = task { // inspired by: https://www.omgubuntu.co.uk/2022/04/how-to-install-firefox-deb-apt-ubuntu-22-04 diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/FirefoxKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/FirefoxKtTest.kt index 666782f..8a30473 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/FirefoxKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/FirefoxKtTest.kt @@ -17,7 +17,7 @@ internal class FirefoxKtTest { fun installFirefox() { // when val result = defaultTestContainer().session { - installFirefox() + installPpaFirefox() checkPackageInstalled("firefox") } @@ -39,7 +39,7 @@ internal class FirefoxKtTest { /* remove for ssh authentication */ PromptSecretSource("Remote password for user $user").secret() ).session { - installFirefox() + installPpaFirefox() firefoxVersion = cmd("apt list firefox --installed").out ?: "" checkPackageInstalled("firefox") }