Skip to content

Commit

Permalink
v0.75.8
Browse files Browse the repository at this point in the history
  • Loading branch information
@VHSgunzo
VHSgunzo committed Feb 20, 2023
1 parent 38a1528 commit cb69e50
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 20 deletions.
2 changes: 1 addition & 1 deletion PKGBUILD
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Maintainer: VHSgunzo <vhsgunzo.github.io>
pkgname='lutris-wine-git'
pkgver='0.75.7'
pkgver='0.75.8'
pkgrel='1'
pkgdesc='Easy launch of your Windows applications and games with Wine/Proton'
arch=('x86_64')
Expand Down
2 changes: 1 addition & 1 deletion db/#LeagueClient.lwdb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ final_check() {
helper_pkexec() {
if [ "$ENABLE_HOSTEXEC" == 1 ]
then
hostexec pkexec sh -c "$1"||return 1
hostexec -su sh -c "$1"||return 1
else
pkexec sh -c "$1"||return 1
fi
Expand Down
2 changes: 1 addition & 1 deletion db/GenshinImpact.lwdb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ check_gi_patch() {
helper_pkexec() {
if [ "$ENABLE_HOSTEXEC" == 1 ]
then
hostexec pkexec sh -c "$1"||return 1
hostexec -su sh -c "$1"||return 1
else
pkexec sh -c "$1"||return 1
fi
Expand Down
42 changes: 25 additions & 17 deletions lutris-wine
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

export LW_VERSION="0.75.7"
export LW_VERSION="0.75.8"
export LW_DEVELOPERS="VHSgunzo"

export RED='\033[1;91m'
Expand Down Expand Up @@ -150,10 +150,10 @@ print_error() {
--text="$2" --center --on-top --fixed --timeout="30" --timeout-indicator="top" --selectable-labels Lutris Wine
elif [[ "$1" == "notify" && -n "$2" && -n "$3" && "$NO_NOTIFY" != 1 && "$NOT_TERM" == 1 ]]
then
notify-send -i "$LW_DEF_ICO" -a 'Lutris Wine' "$2" "$3"
notify-send -i "$LW_DEF_ICO" -a 'Lutris Wine' "$2" "$3" &
elif [[ "$1" == "notify" && -n "$2" && ! -n "$3" && "$NO_NOTIFY" != 1 && "$NOT_TERM" == 1 ]]
then
notify-send -i "$LW_DEF_ICO" -a 'Lutris Wine' "$2"
notify-send -i "$LW_DEF_ICO" -a 'Lutris Wine' "$2" &
fi
}

Expand All @@ -177,10 +177,10 @@ print_info() {
--text="$2" --center --on-top --fixed --timeout="30" --timeout-indicator="top" --selectable-labels Lutris Wine
elif [[ "$1" == "notify" && -n "$2" && -n "$3" && "$NO_NOTIFY" != 1 && "$NOT_TERM" == 1 ]]
then
notify-send -i "$LW_DEF_ICO" -a 'Lutris Wine' "$2" "$3"
notify-send -i "$LW_DEF_ICO" -a 'Lutris Wine' "$2" "$3" &
elif [[ "$1" == "notify" && -n "$2" && ! -n "$3" && "$NO_NOTIFY" != 1 && "$NOT_TERM" == 1 ]]
then
notify-send -i "$LW_DEF_ICO" -a 'Lutris Wine' "$2"
notify-send -i "$LW_DEF_ICO" -a 'Lutris Wine' "$2" &
fi
}

Expand Down Expand Up @@ -214,21 +214,25 @@ check_lupid() {
}

check_wine_pids() {
unset WINE_PIDS CHK_WINE_PIDS
unset WINE_PIDS CHK_WINE_PIDS PROC_EXES
if [ "$ENABLE_HOSTEXEC" == 1 ]
then PROC_EXES="$(echo 'ls -l /proc/*/exe 2>/dev/null'|hostexec)"
else PROC_EXES="$(ls -l /proc/*/exe 2>/dev/null)"
fi
if [[ "$WINE_VERSION" == "System" && "$NEW_WINE_VERSION" != "System" ]] \
|| [[ "$OLD_WINE_VERSION" == "System" && "$NEW_WINE_VERSION" != "System" ]]
then
export CHK_WINE_PIDS="$(ls -l /proc/*/exe 2>/dev/null|\
export CHK_WINE_PIDS="$(echo "$PROC_EXES"|\
grep -ie "$(dirname "$SYS_WINE")"|\
grep -E 'wine(64)?-preloader|wineserver'|\
awk -F/ '{print $3}')"
elif [[ -n "$OLD_WINE_VERSION" && "$OLD_WINE_VERSION" != "System" ]]
then
export CHK_WINE_PIDS="$(ls -l /proc/*/exe 2>/dev/null|\
export CHK_WINE_PIDS="$(echo "$PROC_EXES"|\
grep -ie "$(readlink -f "$LW_WINE_DIR/$OLD_WINE_VERSION")"|\
grep -E 'wine(64)?-preloader|wineserver'|awk -F/ '{print $3}')"
else
export CHK_WINE_PIDS="$(ls -l /proc/*/exe 2>/dev/null|\
export CHK_WINE_PIDS="$(echo "$PROC_EXES"|\
grep -ie "$(readlink -f "$LW_WINE_DIR/$WINE_VERSION")"|\
grep -E 'wine(64)?-preloader|wineserver'|awk -F/ '{print $3}')"
fi
Expand Down Expand Up @@ -257,8 +261,12 @@ check_luwine_sh_pid() {
}

check_exes() {
unset EXE_PIDS CHK_EXES RUN_EXES RUN_EXE
RUN_EXES="$(ps -o pid=,cmd= -p $(ls -l /proc/*/exe 2>/dev/null|\
unset EXE_PIDS CHK_EXES RUN_EXES RUN_EXE PROC_EXES
if [ "$ENABLE_HOSTEXEC" == 1 ]
then PROC_EXES="$(echo 'ls -l /proc/*/exe 2>/dev/null'|hostexec)"
else PROC_EXES="$(ls -l /proc/*/exe 2>/dev/null)"
fi
RUN_EXES="$(ps -o pid=,cmd= -p $(echo "$PROC_EXES"|\
grep -E 'wine(64)?-preloader|wineserver'|awk -F/ '{print $3}') \
2>/dev/null|grep -v 'winedevice'|grep -v 'windows.sys.*'|\
grep -v 'wineserver'|grep -Pv '\d+ start.exe /exec')"
Expand Down Expand Up @@ -459,7 +467,7 @@ download_dll_release() {
then
if [[ -n "$LATESTVERS" && -d "$LW_RUNTIME_DIR/$1/v$dll_version" ]]
then
print_info notify "Latest $1 v$dll_version dlls already installed!" &
print_info notify "Latest $1 v$dll_version dlls already installed!"
touch "$(find "$LW_RUNTIME_DIR/$1" -type d -name "v$dll_version" -print 2>/dev/null)"
unset LATESTVERS FORCE_DLL_UPDATE
dll_manager "$1" "v$dll_version"
Expand Down Expand Up @@ -497,7 +505,7 @@ download_dll_release() {
fi
elif [ -d "$LW_RUNTIME_DIR/$1/v$dll_version" ]
then
print_info notify "$1 v$dll_version dlls already installed!" &
print_info notify "$1 v$dll_version dlls already installed!"
touch "$(find "$LW_RUNTIME_DIR/$1" -type d -name "v$dll_version" -print 2>/dev/null)"
unset LATESTVERS FORCE_DLL_UPDATE
dll_manager "$1" "v$dll_version"
Expand Down Expand Up @@ -3111,7 +3119,7 @@ lu_exit() {
kill $(pgrep -fa 'Winetricks'|awk '{print$1}') 2>/dev/null
pkill winetricks 2>/dev/null
kill $(pgrep -fa 'aria2c'|grep 'LutrisWine'|awk '{print$1}') 2>/dev/null
print_info notify "Lutris Wine successfully killed!" &
print_info notify "Lutris Wine successfully killed!"
sleep 2
try_rm /tmp/FORCE_EXIT /tmp/envbackup* /tmp/syssett* /tmp/winesett* /tmp/ressett* /tmp/settbtn* &>/dev/null
kill $(pgrep -fa "$LW_NAME"|awk '{print$1}')
Expand Down Expand Up @@ -3150,7 +3158,7 @@ lu_killshell() {
break
fi
done
print_info notify "Lutris Wine SHELL processes successfully killed!" &
print_info notify "Lutris Wine SHELL processes successfully killed!"
else
print_error yad "SHELL Killer" "Lutris Wine SHELL processes not found!" &
fi
Expand Down Expand Up @@ -3183,7 +3191,7 @@ lu_killwine() {
then
echo 1 > /tmp/FORCE_EXIT
kill -9 $WINE_PIDS 2>/dev/null
print_info notify "Wine processes successfully killed!" &
print_info notify "Wine processes successfully killed!"
try_rm /tmp/FORCE_EXIT
else
print_error yad "Lutris Wine Killer" "Wine processes not found!" &
Expand All @@ -3199,7 +3207,7 @@ lu_killexe() {
then
echo 1 > /tmp/FORCE_EXIT
kill -9 $EXE_PIDS 2>/dev/null
print_info notify "EXE processes successfully killed!" &
print_info notify "EXE processes successfully killed!"
try_rm /tmp/FORCE_EXIT
else
print_error yad "Lutris Wine EXE Killer" "Lutris Wine EXE processes not found!" &
Expand Down

0 comments on commit cb69e50

Please sign in to comment.