meissa/provs
7
1
Fork 0
Code Issues Pull requests Projects Releases 12 Packages Wiki Activity

rename isntallFirefox to installPpaFirefox

Browse source
This commit is contained in:
ansgarz 2023-07-30 10:21:12 +02:00
parent 9d66a17a1b
commit 32840cdd46
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopService.kt
View file

@ -86,7 +86,7 @@ fun Prov.provisionIdeDesktop(onlyModules: List<String>? = null) {
} else if (onlyModules.contains(DesktopOnlyModule.VERIFY.name.lowercase())) { } else if (onlyModules.contains(DesktopOnlyModule.VERIFY.name.lowercase())) {
verifyIdeSetup() verifyIdeSetup()
} else if (onlyModules.contains(DesktopOnlyModule.FIREFOX.name.lowercase())) { } else if (onlyModules.contains(DesktopOnlyModule.FIREFOX.name.lowercase())) {
installFirefox() installPpaFirefox()
} }
} }
@ -109,7 +109,7 @@ fun Prov.provisionOfficeDesktop(onlyModules: List<String>? = null) {
} else if (onlyModules.contains(DesktopOnlyModule.VERIFY.name.lowercase())) { } else if (onlyModules.contains(DesktopOnlyModule.VERIFY.name.lowercase())) {
verifyOfficeSetup() verifyOfficeSetup()
} else if (onlyModules.contains(DesktopOnlyModule.FIREFOX.name.lowercase())) { } else if (onlyModules.contains(DesktopOnlyModule.FIREFOX.name.lowercase())) {
installFirefox() installPpaFirefox()
} }
} }
@ -140,7 +140,7 @@ fun Prov.provisionBasicDesktop(
provisionKeys(gpg, ssh) provisionKeys(gpg, ssh)
provisionGit(gitUserName ?: whoami(), gitEmail, gpg?.let { gpgFingerprint(it.publicKey.plain()) }) provisionGit(gitUserName ?: whoami(), gitEmail, gpg?.let { gpgFingerprint(it.publicKey.plain()) })
installFirefox() installPpaFirefox()
installGopass() installGopass()
configureGopass(publicGpgKey = gpg?.publicKey) configureGopass(publicGpgKey = gpg?.publicKey)
installGopassJsonApi() installGopassJsonApi()
@ -153,6 +153,6 @@ fun Prov.provisionBasicDesktop(
configureBash() configureBash()
installVirtualBoxGuestAdditions() installVirtualBoxGuestAdditions()
} else if (onlyModules.contains(DesktopOnlyModule.FIREFOX.name.lowercase())) { } else if (onlyModules.contains(DesktopOnlyModule.FIREFOX.name.lowercase())) {
installFirefox() installPpaFirefox()
} }
} }

2
src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Firefox.kt
View file

@ -9,7 +9,7 @@ import java.io.File
/** /**
* Installs non-snap firefox, removing a firefox snap-installation if existing * 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 // inspired by: https://www.omgubuntu.co.uk/2022/04/how-to-install-firefox-deb-apt-ubuntu-22-04

4
src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/FirefoxKtTest.kt
View file

@ -17,7 +17,7 @@ internal class FirefoxKtTest {
fun installFirefox() { fun installFirefox() {
// when // when
val result = defaultTestContainer().session { val result = defaultTestContainer().session {
installFirefox() installPpaFirefox()
checkPackageInstalled("firefox") checkPackageInstalled("firefox")
} }
@ -39,7 +39,7 @@ internal class FirefoxKtTest {
/* remove for ssh authentication */ /* remove for ssh authentication */
PromptSecretSource("Remote password for user $user").secret() PromptSecretSource("Remote password for user $user").secret()
).session { ).session {
installFirefox() installPpaFirefox()
firefoxVersion = cmd("apt list firefox --installed").out ?: "" firefoxVersion = cmd("apt list firefox --installed").out ?: ""
checkPackageInstalled("firefox") checkPackageInstalled("firefox")
} }