v0.78.3.6

VHSgunzo · Mar 17, 2024 · 14559f3 · 14559f3
1 parent b190e51
commit 14559f3
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# v0.78.3.6
+
+* Fix `Remove shortcut` from App Settings
+* Add `application/x-ms-shortcut` MimeType for `Remove shortcut` desktop
+* Fix `Remove shortcut` for `.lnk` files
+* Minor fixes
+
 # v0.78.3.5
 
 * HotFix don't shift `lu_rmapp()` args

diff --git a/applications/rmapp.desktop b/applications/rmapp.desktop
@@ -2,7 +2,7 @@
 Categories=Lux Wine
 Exec="/usr/bin/lux-wine" -rmapp %f
 Icon=/usr/share/lux-wine/icons/lw_default_icon.png
-MimeType=application/x-ms-dos-executable;application/x-msdos-program;text/win-bat;application/x-ms-shortcut;text/x-ms-regedit;application/x-msi
+MimeType=application/x-ms-dos-executable;application/x-msdos-program;text/win-bat;application/x-ms-shortcut;text/x-ms-regedit;application/x-msi;application/x-ms-shortcut
 Name=Remove shortcut
 Name[ru_RU]=Удалить ярлык
 NoDisplay=false

diff --git a/lutris-wine b/lutris-wine
@@ -1 +1 @@
-LW_VERSION="0.78.3.5"
+LW_VERSION="0.78.3.6"
diff --git a/lux-wine b/lux-wine
@@ -59,7 +59,7 @@ OLD_LW_DIR="$HOME/.local/share/LutrisWine"
 [ ! -n "$LW_NAME" ] && export LW_NAME="$(basename "$0")"
 [ ! -n "$LW_DIR" ] && export LW_DIR="$HOME/.local/share/LuxWine"
 [ ! -n "$LW_BIN_DIR" ] && export LW_BIN_DIR="$LW_DIR/bin"
-[ ! -n "$LWRAP" ] && LWRAP="$LW_BIN_DIR/lwrap"
+[ ! -n "$LWRAP" ] && export LWRAP="$LW_BIN_DIR/lwrap"
 [ ! -n "$LW_TRAY" ] && export LW_TRAY="$LWRAP_DIR/bin/lw-tray"
 if [ ! -n "$LW_THEMES_DIR" ]
     then [ -d "$LW_DIR/themes" ] && \
@@ -348,10 +348,10 @@ check_luwine_sh_pid() {
                              awk '{print$1}' 2>/dev/null)"
     for lwshpid in $CHK_LW_SH_PIDS
         do
-            export CHK_LW_SH_PID="$(pgrep -faP "$lwshpid"|grep "$(echo "$TERM_APP"|\
+            CHK_LW_SH_PID="$(pgrep -faP "$lwshpid"|grep "$(echo "$TERM_APP"|\
                                     awk '{print$1}')"|awk '{print$1}' 2>/dev/null)"
             [ -n "$CHK_LW_SH_PID" ] && \
-                export LW_SH_PID="$CHK_LW_SH_PID"
+                export LW_SH_PID="$(ps -opid=,cmd= -p "$CHK_LW_SH_PID" 2>/dev/null|grep -v 'sleep')"
     done
 }
 
@@ -3089,7 +3089,7 @@ lu_config() {
             --field="Registry editor:FBTN" "$LWSHELL -c 'lu_regedit'" \
             --field="Wine uninstaller:FBTN" "$LWSHELL -c 'lu_uninstaller'" \
             --field="Create shortcut:FBTN" "$LWSHELL -c 'lu_shortcut'" \
-            --field="Remove menu app:FBTN" "$LWSHELL -c 'lu_rmapp'" \
+            --field="Remove shortcut:FBTN" "$LWSHELL -c 'lu_rmapp'" \
             --field="Clear prefix:FBTN" "$LWSHELL -c 'btn_tools clearpfx'" \
             --field="Forced init:FBTN" "$LWSHELL -c 'btn_tools init'" \
             --field="Usage info:FBTN" "$LWSHELL -c 'lu_help'" \
@@ -3730,13 +3730,18 @@ lu_rmapp() {
                 else
                     if [ "${1,,}" == "all" ]
                         then rm_allsrtcts ; return $?
-                        else [ -n "$1" ] && LU_EXE="$1"
+                        else
+                            if [ -n "$1" ]
+                                then
+                                    LU_EXE="$1"
+                                    grep -qEiom1 '\.lnk$|\.url$'<<<"$LU_EXE" && \
+                                        LU_EXE="$(sed 's|.lnk$||i;s|.url$||i'<<<"$(basename "$LU_EXE")")"
+                                    grep -qiom1 "^Name=$LU_EXE$" -lr "$MENU_APPS_DIR" 2>/dev/null && \
+                                        get_app_exe "$LU_EXE"
+                            fi
                     fi
             fi
-            grep -qiom1 "^Name=$LU_EXE$" -lr "$MENU_APPS_DIR" 2>/dev/null && \
-                get_app_exe "$LU_EXE"
-            echo "LU_EXE=$LU_EXE"
-            if [[ -n "$(grep -Eiom1 '\.exe$|\.bat$'<<<"$LU_EXE")" ]]
+            if grep -qEiom1 '\.exe$|\.bat$'<<<"$LU_EXE"
                 then
                     (IFS=$'\n'
                     local luapp=1

diff --git a/lwrap/PKGBUILD b/lwrap/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname='lwrap'
 pkgver='0.78.3'
-pkgrel='5'
+pkgrel='6'
 pkgdesc='Lux Wine wrapper for RunImage container'
 arch=('x86_64')
 url='https://github.com/VHSgunzo/lux-wine'