From 148f5792ec7ee316c3f64807aa86ce53a11b4def Mon Sep 17 00:00:00 2001
From: VHSgunzo <wosganzo@gmail.com>
Date: Sun, 17 Mar 2024 17:51:57 +0300
Subject: [PATCH] v0.78.3.5

---
 CHANGELOG.md           | 7 ++++++-
 LuxWineService.desktop | 4 ++--
 lutris-wine            | 2 +-
 lux-wine               | 6 +++---
 lwrap/PKGBUILD         | 2 +-
 lwrap/lwrap            | 7 ++++++-
 6 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c2f5569..753944a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v0.78.3.5
+
+* HotFix don't shift `lu_rmapp()` args
+* Update `lwrap` (installing `LuxWineService.desktop`)
+
 # v0.78.3.4
 
 * Add a submenu for application settings to [lw-tray](https://github.com/VHSgunzo/lw-tray/releases/tag/v0.0.6) `v0.0.6`
@@ -14,7 +19,7 @@
 * Disable check default Wine for some arguments
 * Fix run Debug if in EXEs path exist single quotes
 * Add editable for `Wine version` field in settings
-* Add question for restore from default prefix backup if custom Wine prifix doesn't exist
+* Add question for restore from default prefix backup if custom Wine prefix doesn't exist
 * Add run `console` EXEs in terminal
 * Fix `Wine manager` lists
 * Add `GTK theme` selector to settings (from $HOME/.themes)
diff --git a/LuxWineService.desktop b/LuxWineService.desktop
index ff5316c..b72d8bb 100644
--- a/LuxWineService.desktop
+++ b/LuxWineService.desktop
@@ -109,8 +109,8 @@ Name[ru_RU]=Cоздать ярлык
 [Desktop Action rmapp]
 Exec="/usr/bin/lux-wine" -rmapp %f
 Icon=/usr/share/lux-wine/icons/lw_default_icon.png
-Name=Remove menu app
-Name[ru_RU]=Удалить приложение из меню
+Name=Remove shortcut
+Name[ru_RU]=Удалить ярлык
 
 [Desktop Action tray]
 Exec="/usr/bin/lux-wine" -tray noclose
diff --git a/lutris-wine b/lutris-wine
index 0025c8b..96b316e 100755
--- a/lutris-wine
+++ b/lutris-wine
@@ -1 +1 @@
-LW_VERSION="0.78.3.4"
+LW_VERSION="0.78.3.5"
diff --git a/lux-wine b/lux-wine
index 7f3eb2e..5c75838 100755
--- a/lux-wine
+++ b/lux-wine
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-export LW_VERSION="0.78.3.4"
+export LW_VERSION="0.78.3.5"
 export LW_DEVELOPERS="VHSgunzo"
 
 export RED='\033[1;91m'
@@ -3714,7 +3714,6 @@ lu_rmapp() {
                 wait
         fi)
     }
-    shift
     LWAPPSHRT="$(grep "Categories=Lux Wine Apps" -lr "$MENU_APPS_DIR" 2>/dev/null)"
     if [[ -n "$(echo "$LWAPPSHRT"|head -1)" ]]
         then
@@ -3736,6 +3735,7 @@ lu_rmapp() {
             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")" ]]
                 then
                     (IFS=$'\n'
@@ -6753,7 +6753,7 @@ if [[ "$EUID" == 0 && "$ALLOW_ROOT" != 1 ]]
             -killshell) lu_killshell "$@" ;;
             -exit) lu_exit "$@" ;;
             -clearpfx) lu_clearpfx "$@" ;;
-            -rmapp) lu_rmapp "$@" ;;
+            -rmapp) shift ; lu_rmapp "$@" ;;
             -shortcut) lu_shortcut ;;
             -help) lu_help ;;
             -version) lu_version ;;
diff --git a/lwrap/PKGBUILD b/lwrap/PKGBUILD
index 247e1c4..af1695a 100644
--- a/lwrap/PKGBUILD
+++ b/lwrap/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname='lwrap'
 pkgver='0.78.3'
-pkgrel='4'
+pkgrel='5'
 pkgdesc='Lux Wine wrapper for RunImage container'
 arch=('x86_64')
 url='https://github.com/VHSgunzo/lux-wine'
diff --git a/lwrap/lwrap b/lwrap/lwrap
index a3e02fa..09fc450 100755
--- a/lwrap/lwrap
+++ b/lwrap/lwrap
@@ -157,7 +157,11 @@ make_install() {
             ln_lwrap
             install -Dm755 "$lwexecf" "$LWEXEC"
             install -Dm644 LuxWine.menu "$HOME/.config/menus/applications-merged/LuxWine.menu"
-            install -Dm644 LuxWineService.desktop "$HOME/.local/share/kservices5/ServiceMenus/LuxWineService.desktop"
+            if [ "$KDE_SESSION_VERSION" == 6 ]
+                then install -Dm644 LuxWineService.desktop "$HOME/.local/share/kio/servicemenus/LuxWineService.desktop"
+            elif [ "$KDE_SESSION_VERSION" == 5 ]
+                then install -Dm644 LuxWineService.desktop "$HOME/.local/share/kservices5/ServiceMenus/LuxWineService.desktop"
+            fi
             mkdir -p "$MENU_APPS_DIR"
             mkdir -p "$HOME_DESK_DIRS"
             cp -rf mime "$HOME/.local/share/mime"
@@ -316,6 +320,7 @@ uninstall_lw() {
             rm -rf "$HOME_DESK_DIRS/LuxWine"*
             rm -rf "$HOME/.config/menus/applications-merged/LuxWine.menu"
             rm -rf "$HOME/.local/share/kservices5/ServiceMenus/LuxWine"*
+            rm -rf "$HOME/.local/share/kio/servicemenus/LuxWine"*
             rm -rf "$MENU_APPS_DIR/LutrisWine"
             rm -rf "$HOME_DESK_DIRS/LutrisWine"*
             rm -rf "$HOME/.config/menus/applications-merged/LutrisWine.menu"