From 586b4c2f5a018f446c402bbcbc34f2806c61135d Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Sat, 21 Sep 2024 16:12:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20deb=E5=8D=B8=E8=BD=BDsystemctl=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 debbuild/22.04/DEBIAN/postrm  | 18 +++++++++++-------
 debbuild/22.04/DEBIAN/preinst |  4 ++--
 debbuild/DEBIAN/postrm        | 18 +++++++++++-------
 debbuild/DEBIAN/preinst       |  4 ++--
 4 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/debbuild/22.04/DEBIAN/postrm b/debbuild/22.04/DEBIAN/postrm
index 41ce2f0..0d1573d 100644
--- a/debbuild/22.04/DEBIAN/postrm
+++ b/debbuild/22.04/DEBIAN/postrm
@@ -1,26 +1,30 @@
 # !/bin/bash
 
 X86Lib64Dir=/lib/x86_64-linux-gnu
-cd ${X86Lib64Dir}
-rm libwireshark.so.15
-rm libwireshark.so
-rm libwiretap.so.12
-rm libwiretap.so
-rm libwsutil.so.13
-rm libwsutil.so
+rm -rf ${X86Lib64Dir}/libwireshark.so.15
+rm -rf ${X86Lib64Dir}/libwireshark.so
+rm -rf ${X86Lib64Dir}/libwiretap.so.12
+rm -rf ${X86Lib64Dir}/libwiretap.so
+rm -rf ${X86Lib64Dir}/libwsutil.so.13
+rm -rf ${X86Lib64Dir}/libwsutil.so
 
 #rm -rf /usr/local/omc
+rm -rf /usr/local/etc/omc
 rm -rf /etc/nginx/conf.d/omc.conf
 rm -f /usr/local/bin/omcd
 
+echo -n "Stopping OMC service ... "
 systemctl stop restagent.service
 systemctl stop crontask.service
 systemctl stop sshsvc.service
 systemctl stop captrace.service
+echo "done"
 
+echo -n "Disable OMC service ... "
 systemctl disable restagent.service
 systemctl disable crontask.service
 systemctl disable sshsvc.service
 systemctl disable captrace.service
+echo "done"
 
 systemctl daemon-reload
\ No newline at end of file
diff --git a/debbuild/22.04/DEBIAN/preinst b/debbuild/22.04/DEBIAN/preinst
index 8c7ea39..eb6b33e 100644
--- a/debbuild/22.04/DEBIAN/preinst
+++ b/debbuild/22.04/DEBIAN/preinst
@@ -1,14 +1,14 @@
 # !/bin/bash
 
-echo -n "Stopping OMC service ... "
 systemctl daemon-reload
 if systemctl list-units --type=service --all | grep -q 'restagent.service'; then
+    echo -n "Stopping OMC service ... "
     systemctl stop restagent.service
     systemctl stop crontask.service
     systemctl stop sshsvc.service
     systemctl stop captrace.service
+    echo "done"
 fi
-echo "done"
 
 FERootDir=/usr/local/omc/htdocs/front
 
diff --git a/debbuild/DEBIAN/postrm b/debbuild/DEBIAN/postrm
index 41ce2f0..0d1573d 100644
--- a/debbuild/DEBIAN/postrm
+++ b/debbuild/DEBIAN/postrm
@@ -1,26 +1,30 @@
 # !/bin/bash
 
 X86Lib64Dir=/lib/x86_64-linux-gnu
-cd ${X86Lib64Dir}
-rm libwireshark.so.15
-rm libwireshark.so
-rm libwiretap.so.12
-rm libwiretap.so
-rm libwsutil.so.13
-rm libwsutil.so
+rm -rf ${X86Lib64Dir}/libwireshark.so.15
+rm -rf ${X86Lib64Dir}/libwireshark.so
+rm -rf ${X86Lib64Dir}/libwiretap.so.12
+rm -rf ${X86Lib64Dir}/libwiretap.so
+rm -rf ${X86Lib64Dir}/libwsutil.so.13
+rm -rf ${X86Lib64Dir}/libwsutil.so
 
 #rm -rf /usr/local/omc
+rm -rf /usr/local/etc/omc
 rm -rf /etc/nginx/conf.d/omc.conf
 rm -f /usr/local/bin/omcd
 
+echo -n "Stopping OMC service ... "
 systemctl stop restagent.service
 systemctl stop crontask.service
 systemctl stop sshsvc.service
 systemctl stop captrace.service
+echo "done"
 
+echo -n "Disable OMC service ... "
 systemctl disable restagent.service
 systemctl disable crontask.service
 systemctl disable sshsvc.service
 systemctl disable captrace.service
+echo "done"
 
 systemctl daemon-reload
\ No newline at end of file
diff --git a/debbuild/DEBIAN/preinst b/debbuild/DEBIAN/preinst
index 8c7ea39..eb6b33e 100644
--- a/debbuild/DEBIAN/preinst
+++ b/debbuild/DEBIAN/preinst
@@ -1,14 +1,14 @@
 # !/bin/bash
 
-echo -n "Stopping OMC service ... "
 systemctl daemon-reload
 if systemctl list-units --type=service --all | grep -q 'restagent.service'; then
+    echo -n "Stopping OMC service ... "
     systemctl stop restagent.service
     systemctl stop crontask.service
     systemctl stop sshsvc.service
     systemctl stop captrace.service
+    echo "done"
 fi
-echo "done"
 
 FERootDir=/usr/local/omc/htdocs/front