From d89b028cf1859a3b0674fca0f0450fc684e2a0f8 Mon Sep 17 00:00:00 2001
From: Robin Davies <rerdavies@gmail.com>
Date: Thu, 28 Apr 2022 18:43:10 -0400
Subject: [PATCH] Correct uninstall failure.

---
 .vscode/launch.json |  3 ++-
 src/ConfigMain.cpp  | 23 ++++++++++++++++++-----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 9b4c66a..129fb6b 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -197,7 +197,8 @@
             // Resolved by CMake Tools:
             "program": "${command:cmake.launchTargetPath}",
             "args": [ 
-                "--enable-p2p" , "--nopkexec"
+                "--uninstall"
+                //"--enable-p2p" , "--nopkexec"
                 //,"CA", "PiPedalTest","12345678","1"
             ],
             "stopAtEntry": false,
diff --git a/src/ConfigMain.cpp b/src/ConfigMain.cpp
index 182f85c..f297073 100644
--- a/src/ConfigMain.cpp
+++ b/src/ConfigMain.cpp
@@ -419,11 +419,24 @@ void Uninstall()
     silentSysExec(SYSTEMCTL_BIN " disable jack");
     OnWifiUninstall();
 
-    std::filesystem::remove("/usr/bin/systemd/system/" OLD_SHUTDOWN_SERVICE ".service");
-    std::filesystem::remove("/usr/bin/systemd/system/" ADMIN_SERVICE ".service");
-    std::filesystem::remove("/usr/bin/systemd/system/" PIPEDAL_P2PD_SERVICE ".service");
-    std::filesystem::remove("/usr/bin/systemd/system/" NATIVE_SERVICE ".service");
-    std::filesystem::remove("/usr/bin/systemd/system/" JACK_SERVICE ".service");
+    try {
+        std::filesystem::remove("/usr/bin/systemd/system/" OLD_SHUTDOWN_SERVICE ".service");
+    } catch (...) {}
+    
+    try {
+        std::filesystem::remove("/usr/bin/systemd/system/" ADMIN_SERVICE ".service");
+    } catch (...) {}
+    try {
+        std::filesystem::remove("/usr/bin/systemd/system/" PIPEDAL_P2PD_SERVICE ".service");
+    } catch (...) {}
+
+    try {
+        std::filesystem::remove("/usr/bin/systemd/system/" NATIVE_SERVICE ".service");
+    } catch (...) {}
+
+    try {
+        std::filesystem::remove("/usr/bin/systemd/system/" JACK_SERVICE ".service");
+    } catch (...) {}
     UninstallPamEnv();
     UninstallLimits();
     sysExec(SYSTEMCTL_BIN " daemon-reload");