Skip to content

Commit cb69e50

Browse files
VHSgunzoVHSgunzo
committed
v0.75.8
1 parent 38a1528 commit cb69e50

4 files changed

Lines changed: 28 additions & 20 deletions

File tree

‎PKGBUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Maintainer: VHSgunzo <vhsgunzo.github.io>
22
pkgname='lutris-wine-git'
3-
pkgver='0.75.7'
3+
pkgver='0.75.8'
44
pkgrel='1'
55
pkgdesc='Easy launch of your Windows applications and games with Wine/Proton'
66
arch=('x86_64')

‎db/#LeagueClient.lwdb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ final_check() {
2525
helper_pkexec() {
2626
if [ "$ENABLE_HOSTEXEC" == 1 ]
2727
then
28-
hostexec pkexec sh -c "$1"||return 1
28+
hostexec -su sh -c "$1"||return 1
2929
else
3030
pkexec sh -c "$1"||return 1
3131
fi

‎db/GenshinImpact.lwdb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ check_gi_patch() {
3232
helper_pkexec() {
3333
if [ "$ENABLE_HOSTEXEC" == 1 ]
3434
then
35-
hostexec pkexec sh -c "$1"||return 1
35+
hostexec -su sh -c "$1"||return 1
3636
else
3737
pkexec sh -c "$1"||return 1
3838
fi

‎lutris-wine‎

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
export LW_VERSION="0.75.7"
3+
export LW_VERSION="0.75.8"
44
export LW_DEVELOPERS="VHSgunzo"
55

66
export RED='\033[1;91m'
@@ -150,10 +150,10 @@ print_error() {
150150
--text="$2" --center --on-top --fixed --timeout="30" --timeout-indicator="top" --selectable-labels Lutris Wine
151151
elif [[ "$1" == "notify" && -n "$2" && -n "$3" && "$NO_NOTIFY" != 1 && "$NOT_TERM" == 1 ]]
152152
then
153-
notify-send -i "$LW_DEF_ICO" -a 'Lutris Wine' "$2" "$3"
153+
notify-send -i "$LW_DEF_ICO" -a 'Lutris Wine' "$2" "$3" &
154154
elif [[ "$1" == "notify" && -n "$2" && ! -n "$3" && "$NO_NOTIFY" != 1 && "$NOT_TERM" == 1 ]]
155155
then
156-
notify-send -i "$LW_DEF_ICO" -a 'Lutris Wine' "$2"
156+
notify-send -i "$LW_DEF_ICO" -a 'Lutris Wine' "$2" &
157157
fi
158158
}
159159

@@ -177,10 +177,10 @@ print_info() {
177177
--text="$2" --center --on-top --fixed --timeout="30" --timeout-indicator="top" --selectable-labels Lutris Wine
178178
elif [[ "$1" == "notify" && -n "$2" && -n "$3" && "$NO_NOTIFY" != 1 && "$NOT_TERM" == 1 ]]
179179
then
180-
notify-send -i "$LW_DEF_ICO" -a 'Lutris Wine' "$2" "$3"
180+
notify-send -i "$LW_DEF_ICO" -a 'Lutris Wine' "$2" "$3" &
181181
elif [[ "$1" == "notify" && -n "$2" && ! -n "$3" && "$NO_NOTIFY" != 1 && "$NOT_TERM" == 1 ]]
182182
then
183-
notify-send -i "$LW_DEF_ICO" -a 'Lutris Wine' "$2"
183+
notify-send -i "$LW_DEF_ICO" -a 'Lutris Wine' "$2" &
184184
fi
185185
}
186186

@@ -214,21 +214,25 @@ check_lupid() {
214214
}
215215

216216
check_wine_pids() {
217-
unset WINE_PIDS CHK_WINE_PIDS
217+
unset WINE_PIDS CHK_WINE_PIDS PROC_EXES
218+
if [ "$ENABLE_HOSTEXEC" == 1 ]
219+
then PROC_EXES="$(echo 'ls -l /proc/*/exe 2>/dev/null'|hostexec)"
220+
else PROC_EXES="$(ls -l /proc/*/exe 2>/dev/null)"
221+
fi
218222
if [[ "$WINE_VERSION" == "System" && "$NEW_WINE_VERSION" != "System" ]] \
219223
|| [[ "$OLD_WINE_VERSION" == "System" && "$NEW_WINE_VERSION" != "System" ]]
220224
then
221-
export CHK_WINE_PIDS="$(ls -l /proc/*/exe 2>/dev/null|\
225+
export CHK_WINE_PIDS="$(echo "$PROC_EXES"|\
222226
grep -ie "$(dirname "$SYS_WINE")"|\
223227
grep -E 'wine(64)?-preloader|wineserver'|\
224228
awk -F/ '{print $3}')"
225229
elif [[ -n "$OLD_WINE_VERSION" && "$OLD_WINE_VERSION" != "System" ]]
226230
then
227-
export CHK_WINE_PIDS="$(ls -l /proc/*/exe 2>/dev/null|\
231+
export CHK_WINE_PIDS="$(echo "$PROC_EXES"|\
228232
grep -ie "$(readlink -f "$LW_WINE_DIR/$OLD_WINE_VERSION")"|\
229233
grep -E 'wine(64)?-preloader|wineserver'|awk -F/ '{print $3}')"
230234
else
231-
export CHK_WINE_PIDS="$(ls -l /proc/*/exe 2>/dev/null|\
235+
export CHK_WINE_PIDS="$(echo "$PROC_EXES"|\
232236
grep -ie "$(readlink -f "$LW_WINE_DIR/$WINE_VERSION")"|\
233237
grep -E 'wine(64)?-preloader|wineserver'|awk -F/ '{print $3}')"
234238
fi
@@ -257,8 +261,12 @@ check_luwine_sh_pid() {
257261
}
258262

259263
check_exes() {
260-
unset EXE_PIDS CHK_EXES RUN_EXES RUN_EXE
261-
RUN_EXES="$(ps -o pid=,cmd= -p $(ls -l /proc/*/exe 2>/dev/null|\
264+
unset EXE_PIDS CHK_EXES RUN_EXES RUN_EXE PROC_EXES
265+
if [ "$ENABLE_HOSTEXEC" == 1 ]
266+
then PROC_EXES="$(echo 'ls -l /proc/*/exe 2>/dev/null'|hostexec)"
267+
else PROC_EXES="$(ls -l /proc/*/exe 2>/dev/null)"
268+
fi
269+
RUN_EXES="$(ps -o pid=,cmd= -p $(echo "$PROC_EXES"|\
262270
grep -E 'wine(64)?-preloader|wineserver'|awk -F/ '{print $3}') \
263271
2>/dev/null|grep -v 'winedevice'|grep -v 'windows.sys.*'|\
264272
grep -v 'wineserver'|grep -Pv '\d+ start.exe /exec')"
@@ -459,7 +467,7 @@ download_dll_release() {
459467
then
460468
if [[ -n "$LATESTVERS" && -d "$LW_RUNTIME_DIR/$1/v$dll_version" ]]
461469
then
462-
print_info notify "Latest $1 v$dll_version dlls already installed!" &
470+
print_info notify "Latest $1 v$dll_version dlls already installed!"
463471
touch "$(find "$LW_RUNTIME_DIR/$1" -type d -name "v$dll_version" -print 2>/dev/null)"
464472
unset LATESTVERS FORCE_DLL_UPDATE
465473
dll_manager "$1" "v$dll_version"
@@ -497,7 +505,7 @@ download_dll_release() {
497505
fi
498506
elif [ -d "$LW_RUNTIME_DIR/$1/v$dll_version" ]
499507
then
500-
print_info notify "$1 v$dll_version dlls already installed!" &
508+
print_info notify "$1 v$dll_version dlls already installed!"
501509
touch "$(find "$LW_RUNTIME_DIR/$1" -type d -name "v$dll_version" -print 2>/dev/null)"
502510
unset LATESTVERS FORCE_DLL_UPDATE
503511
dll_manager "$1" "v$dll_version"
@@ -3111,7 +3119,7 @@ lu_exit() {
31113119
kill $(pgrep -fa 'Winetricks'|awk '{print$1}') 2>/dev/null
31123120
pkill winetricks 2>/dev/null
31133121
kill $(pgrep -fa 'aria2c'|grep 'LutrisWine'|awk '{print$1}') 2>/dev/null
3114-
print_info notify "Lutris Wine successfully killed!" &
3122+
print_info notify "Lutris Wine successfully killed!"
31153123
sleep 2
31163124
try_rm /tmp/FORCE_EXIT /tmp/envbackup* /tmp/syssett* /tmp/winesett* /tmp/ressett* /tmp/settbtn* &>/dev/null
31173125
kill $(pgrep -fa "$LW_NAME"|awk '{print$1}')
@@ -3150,7 +3158,7 @@ lu_killshell() {
31503158
break
31513159
fi
31523160
done
3153-
print_info notify "Lutris Wine SHELL processes successfully killed!" &
3161+
print_info notify "Lutris Wine SHELL processes successfully killed!"
31543162
else
31553163
print_error yad "SHELL Killer" "Lutris Wine SHELL processes not found!" &
31563164
fi
@@ -3183,7 +3191,7 @@ lu_killwine() {
31833191
then
31843192
echo 1 > /tmp/FORCE_EXIT
31853193
kill -9 $WINE_PIDS 2>/dev/null
3186-
print_info notify "Wine processes successfully killed!" &
3194+
print_info notify "Wine processes successfully killed!"
31873195
try_rm /tmp/FORCE_EXIT
31883196
else
31893197
print_error yad "Lutris Wine Killer" "Wine processes not found!" &
@@ -3199,7 +3207,7 @@ lu_killexe() {
31993207
then
32003208
echo 1 > /tmp/FORCE_EXIT
32013209
kill -9 $EXE_PIDS 2>/dev/null
3202-
print_info notify "EXE processes successfully killed!" &
3210+
print_info notify "EXE processes successfully killed!"
32033211
try_rm /tmp/FORCE_EXIT
32043212
else
32053213
print_error yad "Lutris Wine EXE Killer" "Lutris Wine EXE processes not found!" &

0 commit comments

Comments
 (0)