Skip to content

Commit 6d13e39

Browse files
new2f7panau161
new2f7
authored andcommitted
Update uninstaller to remove all services files
1 parent 639055b commit 6d13e39

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

install.sh

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -907,13 +907,22 @@ function RemoveAll {
907907
else
908908
Logger "Skipping removal of [$BIN_DIR/$SSH_FILTER] because other programs present that need it." "NOTICE"
909909
fi
910-
RemoveFile "$SERVICE_DIR_SYSTEMD_SYSTEM/$SERVICE_FILE_SYSTEMD_SYSTEM"
911-
RemoveFile "$SERVICE_DIR_SYSTEMD_USER/$SERVICE_FILE_SYSTEMD_USER"
912-
RemoveFile "$SERVICE_DIR_INIT/$SERVICE_FILE_INIT"
913910

914-
RemoveFile "$TARGET_HELPER_SERVICE_DIR_SYSTEMD_SYSTEM/$SERVICE_FILE_SYSTEMD_SYSTEM"
915-
RemoveFile "$TARGET_HELPER_SERVICE_DIR_SYSTEMD_USER/$SERVICE_FILE_SYSTEMD_USER"
916-
RemoveFile "$TARGET_HELPER_SERVICE_DIR_INIT/$SERVICE_FILE_INIT"
911+
# Try to uninstall every possible service file
912+
#if [ $init == "systemd" ]; then
913+
RemoveFile "$SERVICE_DIR_SYSTEMD_SYSTEM/$SERVICE_FILE_SYSTEMD_SYSTEM"
914+
RemoveFile "$SERVICE_DIR_SYSTEMD_USER/$SERVICE_FILE_SYSTEMD_USER"
915+
RemoveFile "$SERVICE_DIR_SYSTEMD_SYSTEM/$TARGET_HELPER_SERVICE_FILE_SYSTEMD_SYSTEM"
916+
RemoveFile "$SERVICE_DIR_SYSTEMD_USER/$TARGET_HELPER_SERVICE_FILE_SYSTEMD_USER"
917+
#elif [ $init == "initV" ]; then
918+
RemoveFile "$SERVICE_DIR_INIT/$SERVICE_FILE_INIT"
919+
RemoveFile "$SERVICE_DIR_INIT/$TARGET_HELPER_SERVICE_FILE_INIT"
920+
#elif [ $init == "openrc" ]; then
921+
RemoveFile "$SERVICE_DIR_OPENRC/$SERVICE_FILE_OPENRC"
922+
RemoveFile "$SERVICE_DIR_OPENRC/$TARGET_HELPER_SERVICE_FILE_OPENRC"
923+
#else
924+
#Logger "Can't uninstall from initV, systemd or openRC." "WARN"
925+
#fi
917926

918927
Logger "Skipping configuration files in [$CONF_DIR]. You may remove this directory manually." "NOTICE"
919928
}

0 commit comments

Comments
 (0)