From 3edef51ffee9acc86c1ee15f21d5ee29607d7482 Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Thu, 7 Mar 2024 00:33:29 +0100
Subject: [PATCH] Remove obsolete workaround

---
 scripts/Arch/Collections/school.sh                |  8 ++++++--
 scripts/Arch/Config/OpenConnect/networkmanager.sh |  5 -----
 scripts/Arch/Config/OpenConnect/plasma-nm.sh      | 12 ------------
 scripts/Arch/Software/OpenConnect/install.sh      |  2 --
 4 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100755 scripts/Arch/Config/OpenConnect/networkmanager.sh
 delete mode 100755 scripts/Arch/Config/OpenConnect/plasma-nm.sh
 delete mode 100755 scripts/Arch/Software/OpenConnect/install.sh

diff --git a/scripts/Arch/Collections/school.sh b/scripts/Arch/Collections/school.sh
index bab6db11..6b52ae02 100755
--- a/scripts/Arch/Collections/school.sh
+++ b/scripts/Arch/Collections/school.sh
@@ -2,8 +2,12 @@
 pushd "${BASH_SOURCE%/*}" > /dev/null;
 
 . "./personal.sh";
-. "../Software/OpenConnect/install.sh";
-. "../Config/OpenConnect/plasma-nm.sh";
+
+# VPN
+yay --noconfirm -Syu \
+    networkmanager-openconnect \
+    openconnect-git \
+    ;
 
 # Communication
 yay --noconfirm -Syu \
diff --git a/scripts/Arch/Config/OpenConnect/networkmanager.sh b/scripts/Arch/Config/OpenConnect/networkmanager.sh
deleted file mode 100755
index 841225f5..00000000
--- a/scripts/Arch/Config/OpenConnect/networkmanager.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-contextRoot="$(mktemp -d)";
-git clone https://git.nuth.ch/manuth/arch-networkmanager-openconnect-unsafe-crypto.git "$contextRoot";
-. "$contextRoot/install.sh";
-rm -rf "$contextRoot";
diff --git a/scripts/Arch/Config/OpenConnect/plasma-nm.sh b/scripts/Arch/Config/OpenConnect/plasma-nm.sh
deleted file mode 100755
index 5ab4eb0f..00000000
--- a/scripts/Arch/Config/OpenConnect/plasma-nm.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-yay --noconfirm -Syu \
-    gcr \
-    webkit2gtk;
-
-yay --noconfirm -Syu \
-    networkmanager-openconnect-git;
-
-contextRoot="$(mktemp -d)";
-git clone https://git.nuth.ch/manuth/arch-plasma-nm-sso.git "$contextRoot";
-. "$contextRoot/install.sh";
-rm -rf "$contextRoot";
diff --git a/scripts/Arch/Software/OpenConnect/install.sh b/scripts/Arch/Software/OpenConnect/install.sh
deleted file mode 100755
index 4bd07d78..00000000
--- a/scripts/Arch/Software/OpenConnect/install.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-yay --noconfirm -Syu openconnect-git;