From 83f9a0e40e52d8056be7f2add3a8e8678c6521c4 Mon Sep 17 00:00:00 2001 From: ansgarz Date: Fri, 10 Jun 2022 12:22:46 +0200 Subject: [PATCH] add package gnupg2 to installation for teams --- .../provs/desktop/infrastructure/MsTeams.kt | 7 +++---- .../infrastructure/{MsTeamsTest.kt => MsTeamsKtTest.kt} | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) rename src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/{MsTeamsTest.kt => MsTeamsKtTest.kt} (89%) diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/MsTeams.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/MsTeams.kt index d8fdc45..f46d518 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/MsTeams.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/MsTeams.kt @@ -4,10 +4,9 @@ import org.domaindrivenarchitecture.provs.framework.core.Prov import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall fun Prov.installMsTeams() = task { - aptInstall("curl") - cmd("curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -") + aptInstall("curl gnupg2") + cmd("curl -sSL https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -") cmd("sudo sh -c 'echo \"deb [arch=amd64] https://packages.microsoft.com/repos/ms-teams stable main\" > /etc/apt/sources.list.d/teams.list'") - //cmd("sudo apt update") + cmd("sudo apt-get update") // apt needs update aptInstall("teams") - //cmd("sudo apt install teams") } \ No newline at end of file diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/MsTeamsTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/MsTeamsKtTest.kt similarity index 89% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/MsTeamsTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/MsTeamsKtTest.kt index 4911955..16d3ef3 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/MsTeamsTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/MsTeamsKtTest.kt @@ -3,9 +3,8 @@ package org.domaindrivenarchitecture.provs.desktop.infrastructure import org.domaindrivenarchitecture.provs.test.defaultTestContainer import org.domaindrivenarchitecture.provs.test.tags.ContainerTest import org.junit.jupiter.api.Assertions.assertTrue -import org.junit.jupiter.api.Test -class MsTeamsTest { +class MsTeamsKtTest { @ContainerTest fun installMsTeams() {