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 f1c2a97..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" | grep .desktop); 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 774b865..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" | grep .desktop); 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() {