From c24d7196002dc31c6a373a83201cba28a039e2f9 Mon Sep 17 00:00:00 2001 From: fufesou Date: Mon, 17 Oct 2022 18:27:14 -0700 Subject: [PATCH] debian prerm, fix condition expression Signed-off-by: fufesou --- res/DEBIAN/prerm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/res/DEBIAN/prerm b/res/DEBIAN/prerm index 6d5026991..c7177e250 100755 --- a/res/DEBIAN/prerm +++ b/res/DEBIAN/prerm @@ -14,14 +14,17 @@ case $1 in rm /etc/systemd/system/rustdesk.service /usr/lib/systemd/system/rustdesk.service || true # workaround temp dev build between 1.1.9 and 1.2.0 - serverUser=$(ps -ef | grep -E 'rustdesk +--server' | awk '{print $1}' | head -1) ubuntuVersion=$(grep -oP 'VERSION_ID="\K[\d]+' /etc/os-release | bc -l) waylandSupportVersion=21 - if [ "$serverUser" != "" ] && [ "$serverUser" != "root" ] && [ "$ubuntuVersion" -ge "$waylandSupportVersion" ] + if [ "$ubuntuVersion" != "" ] && [ "$ubuntuVersion" -ge "$waylandSupportVersion" ] then - systemctl --machine=${serverUser}@.host --user stop rustdesk || true - fi - rm /usr/lib/systemd/user/rustdesk.service >/dev/null 2>/dev/null || true + serverUser=$(ps -ef | grep -E 'rustdesk +--server' | grep -v 'sudo ' | awk '{print $1}' | head -1) + if [ "$serverUser" != "" ] && [ "$serverUser" != "root" ] + then + systemctl --machine=${serverUser}@.host --user stop rustdesk >/dev/null 2>&1 || true + fi + fi + rm /usr/lib/systemd/user/rustdesk.service >/dev/null 2>&1 || true fi ;; esac