From 0ffe1d4b2da17af7d8f76dd6403f4ceacc2ed35e Mon Sep 17 00:00:00 2001
From: Zhang Dingyuan <zhangdingyuan@deepin.org>
Date: Mon, 24 Apr 2023 15:44:57 +0800
Subject: [PATCH] fix: duplicate systemd service

Use Dbus type service, and place it in the app.slice
---
 misc/CMakeLists.txt                           |  1 -
 misc/service/CMakeLists.txt                   | 16 ------------
 misc/service/dde-application-manager.service  | 26 -------------------
 ....deepin.dde.Application1.Instance@.service |  2 +-
 ...rg.deepin.dde.Application1.Manager.service | 12 +++++++--
 5 files changed, 11 insertions(+), 46 deletions(-)
 delete mode 100644 misc/service/CMakeLists.txt
 delete mode 100644 misc/service/dde-application-manager.service

diff --git a/misc/CMakeLists.txt b/misc/CMakeLists.txt
index e81f57d..a60f6b4 100644
--- a/misc/CMakeLists.txt
+++ b/misc/CMakeLists.txt
@@ -1,3 +1,2 @@
 add_subdirectory(systemd)
 add_subdirectory(dconf)
-add_subdirectory(service)
diff --git a/misc/service/CMakeLists.txt b/misc/service/CMakeLists.txt
deleted file mode 100644
index 5ccb0e7..0000000
--- a/misc/service/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-set(SERVICE_FILES
-    dde-application-manager.service
-)
-
-macro(install_symlink filepath wantsdir)
-    file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/link/${wantsdir}/)
-    execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_INSTALL_PREFIX}/lib/systemd/user/${filepath} ${PROJECT_BINARY_DIR}/link/${wantsdir}/${filepath})
-    install(FILES ${PROJECT_BINARY_DIR}/link/${wantsdir}/${filepath} DESTINATION lib/systemd/user/${wantsdir}/)
-endmacro(install_symlink)
-
-# 安装service文件到用户service目录
-install(FILES ${SERVICE_FILES} DESTINATION lib/systemd/user/)
-
-# 创建软链接
-install_symlink(dde-application-manager.service dde-session-daemon.target.wants)
-
diff --git a/misc/service/dde-application-manager.service b/misc/service/dde-application-manager.service
deleted file mode 100644
index a9e8b29..0000000
--- a/misc/service/dde-application-manager.service
+++ /dev/null
@@ -1,26 +0,0 @@
-[Unit]
-Description=DDE application manager service
-RefuseManualStart=no
-RefuseManualStop=no
-#OnFailure=dde-session-shutdown.target
-OnFailureJobMode=replace-irreversibly
-CollectMode=inactive-or-failed
-StartLimitIntervalSec=10s
-StartLimitBurst=30
-
-Requisite=dde-session-manager.target
-After=dde-session-manager.target
-
-Requisite=dde-display.target
-After=dde-display.target
-
-BindsTo=dde-session-daemon.service
-Before=dde-session-daemon.service
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/dde-application-manager
-TimeoutStartSec=infinity
-Slice=components.slice
-Restart=on-failure
-RestartSec=300ms
diff --git a/misc/systemd/org.deepin.dde.Application1.Instance@.service b/misc/systemd/org.deepin.dde.Application1.Instance@.service
index efa0a46..f2919e8 100644
--- a/misc/systemd/org.deepin.dde.Application1.Instance@.service
+++ b/misc/systemd/org.deepin.dde.Application1.Instance@.service
@@ -6,4 +6,4 @@ Type=simple
 Environment="DAM_TASK_HASH=%I"
 Environment="DAM_TASK_TYPE=freedesktop"
 ExecStart=/usr/bin/dde-application-loader
-Slice=applications.slice
\ No newline at end of file
+Slice=app.slice
diff --git a/misc/systemd/org.deepin.dde.Application1.Manager.service b/misc/systemd/org.deepin.dde.Application1.Manager.service
index 3bc0c03..1bcf979 100644
--- a/misc/systemd/org.deepin.dde.Application1.Manager.service
+++ b/misc/systemd/org.deepin.dde.Application1.Manager.service
@@ -1,8 +1,16 @@
 [Unit]
 Description=DDE Application Manager service
+RefuseManualStart=no
+RefuseManualStop=no
+OnFailureJobMode=replace-irreversibly
+CollectMode=inactive-or-failed
+StartLimitIntervalSec=10s
+StartLimitBurst=30
 
 [Service]
-Type=DBus
+Type=dbus
 BusName=org.deepin.dde.Application1.Manager
 ExecStart=/usr/bin/dde-application-manager
-Slice=services.slice
\ No newline at end of file
+Slice=app.slice
+Restart=on-failure
+RestartSec=300ms