Added VERIFY option for ide and office

-o verify can now be used with provs.
Also added an -o firefox option for convenience.
merge-requests/2/head
erik 2 years ago
parent 9b66ea038d
commit 3323e50a43

@ -40,11 +40,14 @@ internal fun Prov.provisionDesktop(
validatePrecondition() validatePrecondition()
provisionBasicDesktop(gpg, ssh, gitUserName, gitEmail, submodules) provisionBasicDesktop(gpg, ssh, gitUserName, gitEmail, submodules)
if (desktopType == DesktopType.OFFICE || desktopType == DesktopType.IDE) { if (desktopType == DesktopType.OFFICE) {
provisionOfficeDesktop(submodules) provisionOfficeDesktop(submodules)
verifyOfficeSetup()
} }
if (desktopType == DesktopType.IDE) { if (desktopType == DesktopType.IDE) {
provisionOfficeDesktop(submodules)
provisionIdeDesktop(submodules) provisionIdeDesktop(submodules)
verifyIdeSetup()
} }
ProvResult(true) ProvResult(true)
} }
@ -72,6 +75,8 @@ fun Prov.provisionIdeDesktop(submodules: List<String>?) {
// IDEs // IDEs
installVSC("python", "clojure") installVSC("python", "clojure")
installIntelliJ() installIntelliJ()
} else if (submodules.contains(DesktopSubmodule.VERIFY.name.lowercase())) {
verifyIdeSetup()
} }
} }
@ -99,6 +104,8 @@ fun Prov.provisionOfficeDesktop(submodules: List<String>?) {
} }
aptInstall(SPELLCHECKING_DE) aptInstall(SPELLCHECKING_DE)
} else if (submodules.contains(DesktopSubmodule.VERIFY.name.lowercase())) {
verifyOfficeSetup()
} }
} }
@ -136,5 +143,7 @@ fun Prov.provisionBasicDesktop(
configureNoSwappiness() configureNoSwappiness()
configureBash() configureBash()
installVirtualBoxGuestAdditions() installVirtualBoxGuestAdditions()
} else if (submodules.contains(DesktopSubmodule.FIREFOX.name.lowercase())) {
installFirefox()
} }
} }

@ -1,5 +1,5 @@
package org.domaindrivenarchitecture.provs.desktop.domain package org.domaindrivenarchitecture.provs.desktop.domain
enum class DesktopSubmodule { enum class DesktopSubmodule {
TEAMS TEAMS, FIREFOX, VERIFY
} }

@ -0,0 +1,13 @@
package org.domaindrivenarchitecture.provs.desktop.infrastructure
import org.domaindrivenarchitecture.provs.framework.core.Prov
import org.domaindrivenarchitecture.provs.framework.core.ProvResult
import org.domaindrivenarchitecture.provs.syspec.domain.verifySpecFromResource
fun Prov.verifyIdeSetup(): ProvResult = task {
verifySpecFromResource("syspec-ide-config.yaml")
}
fun Prov.verifyOfficeSetup(): ProvResult = task {
verifySpecFromResource("syspec-office-config.yaml")
}
Loading…
Cancel
Save