From 321ee905713133690e4f658c3a3656d6e966ff53 Mon Sep 17 00:00:00 2001
From: Htylol <dixperm909@yandex.ru>
Date: Wed, 31 Jul 2024 17:19:02 +0500
Subject: [PATCH] Now shortcuts with spaces are deleted and when there is one
with one .exe path
---
data_from_portwine/scripts/functions_helper | 28 +++++++++++++++------
1 file changed, 20 insertions(+), 8 deletions(-)
diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index ad0effe1..88fac0b6 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -4745,16 +4745,28 @@ pw_auto_create_shortcut () {
export -f pw_auto_create_shortcut
portwine_delete_shortcut () {
- rm -f $(grep -il "${portwine_exe}" "${HOME}/.local/share/applications"/*.desktop) &>/dev/null
- rm -f $(grep -il "${portwine_exe}" "${PORT_WINE_PATH}"/*.desktop) &>/dev/null
- # rm -f $(grep -il "${portwine_exe}" "${STEAM_SCRIPTS}"/*.sh) &>/dev/null
+ PW_DELETE_MENU="$(grep -il "${portwine_exe}" "${HOME}/.local/share/applications"/*.desktop 2>/dev/null)"
+ PW_DELETE_SHORTCUT+=(${PW_DELETE_MENU// /@_@})
+
+ PW_DELETE_PP="$(grep -il "${portwine_exe}" "${PORT_WINE_PATH}"/*.desktop 2>/dev/null)"
+ PW_DELETE_SHORTCUT+=(${PW_DELETE_PP// /@_@})
+
if [[ -d "${HOME}/Desktop" ]] ; then
- rm -f $(grep -il "${portwine_exe}" "${HOME}/Desktop"/*.desktop) &>/dev/null
- elif [[ -d "${HOME}/Рабочий стол" ]] ; then
- rm -f $(grep -il "${portwine_exe}" "${HOME}/Рабочий стол"/*.desktop) &>/dev/null
- elif [[ $(xdg-user-dir DESKTOP) ]] ; then
- rm -f $(grep -il "${portwine_exe}" "$(xdg-user-dir DESKTOP)"/*.desktop) &>/dev/null
+ PW_DELETE_DESKTOP="$(grep -il "${portwine_exe}" "${HOME}/Desktop"/*.desktop 2>/dev/null)"
+ PW_DELETE_SHORTCUT+=(${PW_DELETE_DESKTOP// /@_@})
fi
+ if [[ -d "${HOME}/Рабочий стол" ]] ; then
+ PW_DELETE_DESKTOP="$(grep -il "${portwine_exe}" "${HOME}/Рабочий стол"/*.desktop 2>/dev/null)"
+ PW_DELETE_SHORTCUT+=(${PW_DELETE_DESKTOP// /@_@})
+ fi
+ if [[ $(xdg-user-dir DESKTOP) ]] ; then
+ PW_DELETE_DESKTOP="$(grep -il "${portwine_exe}" "$(xdg-user-dir DESKTOP)"/*.desktop 2>/dev/null)"
+ PW_DELETE_SHORTCUT+=(${PW_DELETE_DESKTOP// /@_@})
+ fi
+
+ for delete_shortcut in ${PW_DELETE_SHORTCUT[@]} ; do
+ rm -f "${delete_shortcut//@_@/ }"
+ done
}
portwine_missing_shortcut () {