Skip to content

Commit

Permalink
Fix prefix restore on first run with -init
Browse files Browse the repository at this point in the history
  • Loading branch information
VHSgunzo committed Jan 2, 2024
1 parent de6a930 commit 0170fdd
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 5 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# v0.78.2.3

* Update [lwrun](https://huggingface.co/lux-wine/lwrun/tree/main/releases/v0.39.1) packages
* Revert/replace `mesa-tkg-git` with `mesa` in `lwrun`
* Fix prefix restore on first run with `-init`

# v0.78.2.2

* Add ability to create config for `msi`, `reg`, `bat` and `lnk`
Expand Down
3 changes: 1 addition & 2 deletions lux-wine
Original file line number Diff line number Diff line change
Expand Up @@ -6205,8 +6205,7 @@ lu_pfxrestore() {
[ "$DEFPFXRESTORE" == 1 ] && \
PFXRESTORE_MSG="The default prefix is not initialized! \nDo you want to restore the default prefix from the backup?"||\
PFXRESTORE_MSG="Are you sure you want to restore this prefix backup image?"
if [[ "$DEFPFXRESTORE" == 1 && "$NETSTATUS" == 0 ]]|| \
[[ "$DEFPFXRESTORE" == 1 && "$FIRST_RUN" == 1 ]]||\
if ([ "$DEFPFXRESTORE" == 1 ] && (is_first_run||[ "$NETSTATUS" == 0 ]))||\
print_question "Prefix restore" "${PFXRESTORE_MSG}\n[ $LU_LWPFX ]"
then
pfxrestore||return 1
Expand Down
2 changes: 1 addition & 1 deletion lwrap/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pkgname='lwrap'
pkgver='0.78.2'
pkgrel='2'
pkgrel='3'
pkgdesc='Lux Wine wrapper for RunImage container'
arch=('x86_64')
url='https://github.com/VHSgunzo/lux-wine'
Expand Down
12 changes: 10 additions & 2 deletions lwrap/lwrap.install
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,16 @@ post_upgrade() {
pac -Q zenity 2>/dev/null|grep -q '4.0.0' && \
pkg_tool 'yes|sudo downgrade zenity=3.44.2'

pac -Q mesa 2>/dev/null|grep -q '23.3.2' && \
pkg_tool 'yes|pac -Sy mesa-tkg-git && yes|pac -S lib32-mesa-tkg-git'
if pac -Q lib32-mesa-tkg-git &>/dev/null
then
pkg_tool 'yes|pac -Rsndd mesa-tkg-git lib32-mesa-tkg-git'
pkg_tool 'yes|pac -S mesa vulkan-swrast libva-mesa-driver mesa-vdpau vulkan-mesa-layers \
vulkan-intel vulkan-radeon lib32-mesa lib32-vulkan-swrast lib32-libva-mesa-driver \
lib32-mesa-vdpau lib32-vulkan-mesa-layers lib32-vulkan-intel lib32-vulkan-radeon'
fi

pac -Q vulkan-virtio &>/dev/null && \
pkg_tool 'yes|pac -Rdd vulkan-virtio lib32-vulkan-virtio'

return 0
}
Expand Down

0 comments on commit 0170fdd

Please sign in to comment.