shawn/op-pedal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct uninstall failure.

Browse Source
This commit is contained in:
Robin Davies
2022-04-28 18:43:10 -04:00
parent 6220cdb0b8
commit d89b028cf1
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vscode/launch.json
Vendored
+2 -1
View File
@@ -197,7 +197,8 @@
// Resolved by CMake Tools: // Resolved by CMake Tools:
"program": "${command:cmake.launchTargetPath}", "program": "${command:cmake.launchTargetPath}",
"args": [ "args": [
"--enable-p2p" , "--nopkexec" "--uninstall"
//"--enable-p2p" , "--nopkexec"
//,"CA", "PiPedalTest","12345678","1" //,"CA", "PiPedalTest","12345678","1"
], ],
"stopAtEntry": false, "stopAtEntry": false,
src/ConfigMain.cpp
+18 -5
View File
@@ -419,11 +419,24 @@ void Uninstall()
silentSysExec(SYSTEMCTL_BIN " disable jack"); silentSysExec(SYSTEMCTL_BIN " disable jack");
OnWifiUninstall(); OnWifiUninstall();
std::filesystem::remove("/usr/bin/systemd/system/" OLD_SHUTDOWN_SERVICE ".service"); try {
std::filesystem::remove("/usr/bin/systemd/system/" ADMIN_SERVICE ".service"); std::filesystem::remove("/usr/bin/systemd/system/" OLD_SHUTDOWN_SERVICE ".service");
std::filesystem::remove("/usr/bin/systemd/system/" PIPEDAL_P2PD_SERVICE ".service"); } catch (...) {}
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/" 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(); UninstallPamEnv();
UninstallLimits(); UninstallLimits();
sysExec(SYSTEMCTL_BIN " daemon-reload"); sysExec(SYSTEMCTL_BIN " daemon-reload");