From 9f1f21c2b682f1dfd09d42e2f891bbe16016b973 Mon Sep 17 00:00:00 2001 From: shenmo Date: Tue, 31 Oct 2023 15:08:36 +0000 Subject: [PATCH 1/3] update tool/ssinstall. Signed-off-by: shenmo --- tool/ssinstall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/ssinstall b/tool/ssinstall index 774b865..54a82f4 100755 --- a/tool/ssinstall +++ b/tool/ssinstall @@ -29,7 +29,7 @@ function create_desktop_file() { } function exec_create_desktop_file() { local user=$(who | awk '{print $1}' | head -n 1) - for desktop_file_path in $(dpkg -L "$package_name" | grep .desktop); do + for desktop_file_path in $(dpkg -L "$package_name" | awk '/\.desktop$/ {print}'); do if [ "$(cat $desktop_file_path | grep NoDisplay=true)" = "" ];then echo $desktop_file_path is checked and will be installed to desktop sudo -u "$user" cp "$desktop_file_path" "$(sudo -u "$user" xdg-user-dir DESKTOP)/" From 321e6b3dfe369f8028c9b0f2389d329636231906 Mon Sep 17 00:00:00 2001 From: shenmo Date: Tue, 31 Oct 2023 15:08:58 +0000 Subject: [PATCH 2/3] update tool/ssaudit. Signed-off-by: shenmo --- tool/ssaudit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/ssaudit b/tool/ssaudit index f1c2a97..a20e02c 100755 --- a/tool/ssaudit +++ b/tool/ssaudit @@ -29,7 +29,7 @@ function create_desktop_file() { } function exec_create_desktop_file() { local user=$(who | awk '{print $1}' | head -n 1) - for desktop_file_path in $(dpkg -L "$package_name" | grep .desktop); do + for desktop_file_path in $(dpkg -L "$package_name" | awk '/\.desktop$/ {print}'); do if [ "$(cat $desktop_file_path | grep NoDisplay=true)" = "" ];then echo $desktop_file_path is checked and will be installed to desktop sudo -u "$user" cp "$desktop_file_path" "$(sudo -u "$user" xdg-user-dir DESKTOP)/" From 2efd9dc1700738c23c1d3b1da43304d799f99840 Mon Sep 17 00:00:00 2001 From: shenmo Date: Thu, 2 Nov 2023 22:39:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9AA2D=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E9=87=8A=E6=94=BE=E6=97=A0=E6=95=88=E7=9A=84Desktop?= =?UTF-8?q?=E5=88=B0=E6=A1=8C=E9=9D=A2=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 6 ++++++ tool/ssaudit | 10 +++++++++- tool/ssinstall | 10 +++++++++- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 49956cd..f8c4589 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +spark-store (4.2.8.1) stable; urgency=medium + + * 修复：A2D应用释放无效的Desktop到桌面上 + + -- shenmo Sun, 5 Mar 2022 11:45:14 +0800 + spark-store (4.2.8) stable; urgency=medium * 修复：在aptss上锁时支持等待释放锁而不是直接报错退出 diff --git a/tool/ssaudit b/tool/ssaudit index a20e02c..fd5f1aa 100755 --- a/tool/ssaudit +++ b/tool/ssaudit @@ -29,12 +29,20 @@ function create_desktop_file() { } function exec_create_desktop_file() { local user=$(who | awk '{print $1}' | head -n 1) - for desktop_file_path in $(dpkg -L "$package_name" | awk '/\.desktop$/ {print}'); do + for desktop_file_path in $(dpkg -L "$package_name" |grep /usr/share/applications/ | awk '/\.desktop$/ {print}'); do if [ "$(cat $desktop_file_path | grep NoDisplay=true)" = "" ];then echo $desktop_file_path is checked and will be installed to desktop sudo -u "$user" cp "$desktop_file_path" "$(sudo -u "$user" xdg-user-dir DESKTOP)/" fi done + for desktop_file_path in $(dpkg -L "$package_name" |grep /opt/apps/$package_name/entries/applications | awk '/\.desktop$/ {print}'); do + if [ "$(cat $desktop_file_path | grep NoDisplay=true)" = "" ];then + echo $desktop_file_path is checked and will be installed to desktop + sudo -u "$user" cp "$desktop_file_path" "$(sudo -u "$user" xdg-user-dir DESKTOP)/" + fi + done + + } function zenity() { diff --git a/tool/ssinstall b/tool/ssinstall index 54a82f4..1fa1733 100755 --- a/tool/ssinstall +++ b/tool/ssinstall @@ -29,12 +29,20 @@ function create_desktop_file() { } function exec_create_desktop_file() { local user=$(who | awk '{print $1}' | head -n 1) - for desktop_file_path in $(dpkg -L "$package_name" | awk '/\.desktop$/ {print}'); do + for desktop_file_path in $(dpkg -L "$package_name" |grep /usr/share/applications/ | awk '/\.desktop$/ {print}'); do if [ "$(cat $desktop_file_path | grep NoDisplay=true)" = "" ];then echo $desktop_file_path is checked and will be installed to desktop sudo -u "$user" cp "$desktop_file_path" "$(sudo -u "$user" xdg-user-dir DESKTOP)/" fi done + for desktop_file_path in $(dpkg -L "$package_name" |grep /opt/apps/$package_name/entries/applications | awk '/\.desktop$/ {print}'); do + if [ "$(cat $desktop_file_path | grep NoDisplay=true)" = "" ];then + echo $desktop_file_path is checked and will be installed to desktop + sudo -u "$user" cp "$desktop_file_path" "$(sudo -u "$user" xdg-user-dir DESKTOP)/" + fi + done + + } function zenity() {