From 830a93a468f51f83c8e733f2befafaa00f468f82 Mon Sep 17 00:00:00 2001 From: jerger Date: Mon, 18 Jul 2022 19:02:39 +0200 Subject: [PATCH] release --- build.gradle | 2 +- .../provs/desktop/domain/DesktopService.kt | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index e89fabb..99d31ce 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ apply plugin: "kotlinx-serialization" group = "org.domaindrivenarchitecture.provs" -version = "release-0.15.1-SNAPSHOT" +version = "release-0.15.1" repositories { mavenCentral() 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 93296ac..16d2e7a 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopService.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopService.kt @@ -58,7 +58,7 @@ fun Prov.validatePrecondition() { } fun Prov.provisionIdeDesktop(submodules: List?) { - if (submodules != null) { + if (submodules == null) { aptInstall(OPEN_VPM) aptInstall(OPENCONNECT) aptInstall(VPNC) @@ -78,14 +78,15 @@ fun Prov.provisionIdeDesktop(submodules: List?) { } fun Prov.provisionMSDesktop(submodules: List?) { - if (submodules?.contains(DesktopSubmodule.TEAMS.name.lowercase()) == true) { + if (submodules == null) { + installMsTeams() + } else if (submodules?.contains(DesktopSubmodule.TEAMS.name.lowercase()) == true) { installMsTeams() - } else { } } fun Prov.provisionOfficeDesktop(submodules: List?) { - if (submodules != null) { + if (submodules == null) { aptInstall(ZIP_UTILS) aptInstall(BROWSER) aptInstall(EMAIL_CLIENT) @@ -109,7 +110,7 @@ fun Prov.provisionBaseDesktop( gitEmail: String?, submodules: List? ) { - if (submodules != null) { + if (submodules == null) { aptInstall(KEY_MANAGEMENT) aptInstall(VERSION_MANAGEMENT) aptInstall(NETWORK_TOOLS)