This commit is contained in:
jerger 2022-07-18 19:02:39 +02:00
parent 7b87278326
commit 830a93a468
2 changed files with 7 additions and 6 deletions

View file

@ -18,7 +18,7 @@ apply plugin: "kotlinx-serialization"
group = "org.domaindrivenarchitecture.provs" group = "org.domaindrivenarchitecture.provs"
version = "release-0.15.1-SNAPSHOT" version = "release-0.15.1"
repositories { repositories {
mavenCentral() mavenCentral()

View file

@ -58,7 +58,7 @@ fun Prov.validatePrecondition() {
} }
fun Prov.provisionIdeDesktop(submodules: List<String>?) { fun Prov.provisionIdeDesktop(submodules: List<String>?) {
if (submodules != null) { if (submodules == null) {
aptInstall(OPEN_VPM) aptInstall(OPEN_VPM)
aptInstall(OPENCONNECT) aptInstall(OPENCONNECT)
aptInstall(VPNC) aptInstall(VPNC)
@ -78,14 +78,15 @@ fun Prov.provisionIdeDesktop(submodules: List<String>?) {
} }
fun Prov.provisionMSDesktop(submodules: List<String>?) { fun Prov.provisionMSDesktop(submodules: List<String>?) {
if (submodules?.contains(DesktopSubmodule.TEAMS.name.lowercase()) == true) { if (submodules == null) {
installMsTeams()
} else if (submodules?.contains(DesktopSubmodule.TEAMS.name.lowercase()) == true) {
installMsTeams() installMsTeams()
} else {
} }
} }
fun Prov.provisionOfficeDesktop(submodules: List<String>?) { fun Prov.provisionOfficeDesktop(submodules: List<String>?) {
if (submodules != null) { if (submodules == null) {
aptInstall(ZIP_UTILS) aptInstall(ZIP_UTILS)
aptInstall(BROWSER) aptInstall(BROWSER)
aptInstall(EMAIL_CLIENT) aptInstall(EMAIL_CLIENT)
@ -109,7 +110,7 @@ fun Prov.provisionBaseDesktop(
gitEmail: String?, gitEmail: String?,
submodules: List<String>? submodules: List<String>?
) { ) {
if (submodules != null) { if (submodules == null) {
aptInstall(KEY_MANAGEMENT) aptInstall(KEY_MANAGEMENT)
aptInstall(VERSION_MANAGEMENT) aptInstall(VERSION_MANAGEMENT)
aptInstall(NETWORK_TOOLS) aptInstall(NETWORK_TOOLS)