Skip to content

Commit 3227cc1

Browse files
VHSgunzoVHSgunzo
committed
Fix check_git_release()
Update lwrap Minor fixes
1 parent 3a800a6 commit 3227cc1

4 files changed

Lines changed: 221 additions & 117 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.76.1'
3+
pkgver='0.76.2'
44
pkgrel='1'
55
pkgdesc='Easy launch of your Windows applications and games with Wine/Proton'
66
arch=('x86_64')

‎lutris-wine‎

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

3-
export LW_VERSION="0.76.1"
3+
export LW_VERSION="0.76.2"
44
export LW_DEVELOPERS="VHSgunzo"
55

66
export RED='\033[1;91m'
@@ -171,10 +171,10 @@ print_error() {
171171
--text="$2" --center --on-top --fixed --timeout="30" --timeout-indicator="top" --selectable-labels Lutris Wine
172172
elif [[ "$1" == "notify" && -n "$2" && -n "$3" && "$NO_NOTIFY" != 1 && "$NOT_TERM" == 1 ]]
173173
then
174-
notify-send -i "$LW_DEF_ICO" -a 'Lutris Wine' "$2" "$3" &
174+
notify-send -i "$LW_DEF_ICO" -a 'Lutris Wine Error' "$2" "$3" &
175175
elif [[ "$1" == "notify" && -n "$2" && ! -n "$3" && "$NO_NOTIFY" != 1 && "$NOT_TERM" == 1 ]]
176176
then
177-
notify-send -i "$LW_DEF_ICO" -a 'Lutris Wine' "$2" &
177+
notify-send -i "$LW_DEF_ICO" -a 'Lutris Wine Error' "$2" &
178178
fi
179179
}
180180

@@ -198,10 +198,10 @@ print_info() {
198198
--text="$2" --center --on-top --fixed --timeout="30" --timeout-indicator="top" --selectable-labels Lutris Wine
199199
elif [[ "$1" == "notify" && -n "$2" && -n "$3" && "$NO_NOTIFY" != 1 && "$NOT_TERM" == 1 ]]
200200
then
201-
notify-send -i "$LW_DEF_ICO" -a 'Lutris Wine' "$2" "$3" &
201+
notify-send -i "$LW_DEF_ICO" -a 'Lutris Wine Info' "$2" "$3" &
202202
elif [[ "$1" == "notify" && -n "$2" && ! -n "$3" && "$NO_NOTIFY" != 1 && "$NOT_TERM" == 1 ]]
203203
then
204-
notify-send -i "$LW_DEF_ICO" -a 'Lutris Wine' "$2" &
204+
notify-send -i "$LW_DEF_ICO" -a 'Lutris Wine Info' "$2" &
205205
fi
206206
}
207207

@@ -361,19 +361,19 @@ check_git_release() {
361361
then
362362
if [ ! -n "$(grep -o "DXVK_NVAPI_VERSION" "$LW_CFG")" ]
363363
then
364-
echo "export DXVK_NVAPI_VERSION='v$dll_version'" >> "$LW_CFG"
364+
echo "DXVK_NVAPI_VERSION='v$dll_version'" >> "$LW_CFG"
365365
import_luwine_wcfg
366366
else
367-
sed -i "s/export DXVK_NVAPI_VERSION.*/export DXVK_NVAPI_VERSION='v$dll_version'/" "$LW_CFG"
367+
sed -i "s/DXVK_NVAPI_VERSION.*/DXVK_NVAPI_VERSION='v$dll_version'/" "$LW_CFG"
368368
import_luwine_wcfg
369369
fi
370370
else
371371
if [ ! -n "$(grep -io "$1_version" "$LW_CFG")" ]
372372
then
373-
echo "export $(echo "$1_version"|tr [:lower:] [:upper:])='v$dll_version'" >> "$LW_CFG"
373+
echo "$(echo "$1_version"|tr [:lower:] [:upper:])='v$dll_version'" >> "$LW_CFG"
374374
import_luwine_wcfg
375375
else
376-
sed -i "s/export $(echo "$1_version"|tr [:lower:] [:upper:]).*/export $(echo "$1_version"|tr [:lower:] [:upper:])='v$dll_version'/" "$LW_CFG"
376+
sed -i "s/$(echo "$1_version"|tr [:lower:] [:upper:]).*/$(echo "$1_version"|tr [:lower:] [:upper:])='v$dll_version'/" "$LW_CFG"
377377
import_luwine_wcfg
378378
fi
379379
fi
@@ -2297,11 +2297,12 @@ check_first_run() {
22972297
xdg-mime default LutrisWine.desktop "$winemimetype"
22982298
done
22992299
update-desktop-database -q "$LW_MENU_APP_DIR"
2300+
[ ! -L "$HOME/LutrisWine" ] && \
2301+
try_ln "$LW_DIR" "$HOME/"
23002302
touch "$LW_DIR/.firstrun"
23012303
[ "$1" != "-init" ] && full_init
23022304
unset FIRST_RUN
23032305
fi
2304-
[ ! -d "$HOME/LutrisWine" ] && try_ln "$LW_DIR" "$HOME/"
23052306
}
23062307

23072308
check_virt_desktop() {
@@ -3154,7 +3155,7 @@ lu_exit() {
31543155
try_rm /tmp/FORCE_EXIT /tmp/envbackup* /tmp/syssett* /tmp/winesett* /tmp/ressett* /tmp/settbtn* &>/dev/null
31553156
kill $(pgrep -fa "$LW_NAME"|awk '{print$1}')
31563157
else
3157-
print_error yad "Lutris Wine Killer" "Lutris Wine not runing!" &
3158+
print_error yad "Lutris Wine Killer" "Lutris Wine not runing!"
31583159
fi
31593160
}
31603161

@@ -3190,7 +3191,7 @@ lu_killshell() {
31903191
done
31913192
print_info notify "Lutris Wine SHELL processes successfully killed!"
31923193
else
3193-
print_error yad "SHELL Killer" "Lutris Wine SHELL processes not found!" &
3194+
print_error yad "SHELL Killer" "Lutris Wine SHELL processes not found!"
31943195
fi
31953196
}
31963197

@@ -3205,7 +3206,7 @@ lu_killtray() {
32053206
kill "$TRAY_PID" 2>/dev/null
32063207
try_rm /tmp/FORCE_EXIT
32073208
else
3208-
print_error yad "Tray Killer" "Lutris Wine not runing in tray!" &
3209+
print_error yad "Tray Killer" "Lutris Wine not runing in tray!"
32093210
fi
32103211
}
32113212

@@ -3224,7 +3225,7 @@ lu_killwine() {
32243225
print_info notify "Wine processes successfully killed!"
32253226
try_rm /tmp/FORCE_EXIT
32263227
else
3227-
print_error yad "Lutris Wine Killer" "Wine processes not found!" &
3228+
print_error yad "Lutris Wine Killer" "Wine processes not found!"
32283229
fi
32293230
}
32303231

@@ -3240,7 +3241,7 @@ lu_killexe() {
32403241
print_info notify "EXE processes successfully killed!"
32413242
try_rm /tmp/FORCE_EXIT
32423243
else
3243-
print_error yad "Lutris Wine EXE Killer" "Lutris Wine EXE processes not found!" &
3244+
print_error yad "Lutris Wine EXE Killer" "Lutris Wine EXE processes not found!"
32443245
fi
32453246
}
32463247

@@ -3939,7 +3940,7 @@ check_themes() {
39393940
fi
39403941
fi
39413942
else
3942-
print_error yad "Lutris Wine themes not found!" &
3943+
print_error yad "Lutris Wine themes not found!"
39433944
return 1
39443945
fi
39453946
}
@@ -5417,11 +5418,11 @@ check_loadbar_cover() {
54175418
then
54185419
export LOADBARGIF="$LW_DEF_LOAD_GIF"
54195420
sed -i "s@export LOADBARGIF.*@export LOADBARGIF='$LW_DEF_LOAD_GIF'@g" "$LW_CFG" 2>/dev/null
5420-
print_error yad "Lutris Wine Cover Loader" "Unsupported loading bar cover file! Reset to default cover." &
5421+
print_error yad "Lutris Wine Cover Loader" "Unsupported loading bar cover file! Reset to default cover."
54215422
else
54225423
export LOADBAR=0
54235424
sed -i "s/export LOADBAR.*/export LOADBAR='0'/g" "$LW_CFG" 2>/dev/null
5424-
print_error yad "Lutris Wine Cover Loader" "Not found default loading bar cover! Cover is disabled!" &
5425+
print_error yad "Lutris Wine Cover Loader" "Not found default loading bar cover! Cover is disabled!"
54255426
fi
54265427
fi
54275428
}
@@ -5681,7 +5682,7 @@ lu_pfxrestore() {
56815682
try_rm "$PFXRESTORE_DIR" &>/dev/null
56825683
try_mv "${LW_DEF_TMP}/$LWPFX_NAME" "${LW_DEF_WPFXS_DIR}/"
56835684
print_info notify "The prefix backup is successfully restored!"
5684-
$LW_FLMGR "$PFXRESTORE_DIR" &>/dev/null &
5685+
$LW_FLMGR "$PFXRESTORE_DIR" &>/dev/null
56855686
return 0
56865687
else
56875688
try_rm "${LW_DEF_TMP}/$LWPFX_NAME" &>/dev/null

‎lwrap/PKGBUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Maintainer: VHSgunzo <vhsgunzo.github.io>
22
pkgname='lwrap'
33
gitrepo='lutris-wine'
4-
pkgver='0.76.1'
4+
pkgver='0.76.2'
55
pkgrel='1'
66
pkgdesc='Lutris Wine wrapper for Runimage container'
77
arch=('x86_64')

0 commit comments

Comments
 (0)