Skip to content

Commit

Permalink
v0.80.1
Browse files Browse the repository at this point in the history
  • Loading branch information
VHSgunzo committed Jan 16, 2025
1 parent 5495369 commit faf1902
Show file tree
Hide file tree
Showing 8 changed files with 283 additions and 732 deletions.
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
# v0.80.1

* Update [lwrun](https://github.com/VHSgunzo/runimage/releases/download/v0.40.1) container `v0.40.1`
* Update [GE-Proton](https://github.com/VHSgunzo/ge-proton-lw/releases/tag/v9.22) `v9.22`
* Change container filesystem to [DwarFS](https://github.com/mhx/dwarfs) (reduce size)
* Enable `OverlayFS` (read-write) mode by default
* Now you can install any apps and updates from the container repos without rebuilding the container
* Fix `firefox`, `steam`, `lux-wine` decorations (now as in the system)
* Remove `AMDVLK` vulkan driver
* Update `lwrap`
* Add `ru_RU.KOI8-R` locale
* Remove `lwexec` and all the other pieces that are now part of the container.
* Add [continuous](https://github.com/VHSgunzo/lwrun/releases/download/continuous) update CI for lwrun
* Add ability to enable sandbox for `HOME` or create tmpfs `HOME`
* Add ability to `lwrun` to system `/usr/bin` `/bin` `/opt` path
* Replace `glibc` and `lib32-glibc` with `glibc-eac` and `lib32-glibc-eac`
* Add an attempt to use a local proprietary Nvidia driver (if there are no 32-bit libs, the driver will be downloaded as before)

# v0.78.5.5

* Update [lwrun](https://huggingface.co/lux-wine/lwrun/tree/main/releases/v0.39.1) packages
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2024 VHSgunzo
Copyright (c) 2025 VHSgunzo

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ wget -qO - lux-wine-git.static.hf.space|sed 1d|bash
## **Terminal usage**:
```
┌──[user@linux]─[~]
└──╼ $ lwrap {lwrap arg} blabla.exe {exe args}
└──╼ $ lwrun {lwrun arg} blabla.exe {exe args}
-explorer Wine explorer
-cmd Open CMD or open file in CMD
Expand Down Expand Up @@ -107,6 +107,7 @@ lwrun --uninstall
- [x] Easy installation without root rights and dependencies
- [x] The ability to install completely offline
- [x] Own portable [lwrun container](https://github.com/VHSgunzo/lwrun) with isolation from the host system
- [x] Ability to install apps from container repositories without root permissions
- [x] Automatic rolling update system
- [x] Quick initialization and launch
- [x] Ability to specify EXE arguments and save them in settings
Expand Down
57 changes: 8 additions & 49 deletions lux-wine
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

export LW_VERSION="0.78.5.5"
export LW_VERSION="0.80.1"
export LW_DEVELOPERS="VHSgunzo"

export RED='\033[1;91m'
Expand Down Expand Up @@ -59,7 +59,7 @@ OLD_LW_DIR="$HOME/.local/share/LutrisWine"
[ ! -n "$LW_NAME" ] && export LW_NAME="$(basename "$0")"
[ ! -n "$LW_DIR" ] && export LW_DIR="$HOME/.local/share/LuxWine"
[ ! -n "$LW_BIN_DIR" ] && export LW_BIN_DIR="$LW_DIR/bin"
[ ! -n "$LWRAP" ] && export LWRAP="$LW_BIN_DIR/lwrap"
[ ! -n "$LWRUN" ] && export LWRUN="$LW_BIN_DIR/lwrun"
if [ ! -n "$LW_TRAY" ]
then
[ "$DESKTOP_SESSION" == "plasma" ] && \
Expand Down Expand Up @@ -1561,7 +1561,7 @@ create_shortcut() {
SHRT_NAME="$SHRT_NAME ($(basename "$WINEPREFIX"))"
DESKF="${LW_DEF_TMP}/${SHRT_NAME}.desktop"
echo "[Desktop Entry]" > "$DESKF"
(LW_SOURCE="$LWRAP"
(LW_SOURCE="$LWRUN"
[[ "$1" =~ "'" ]] && \
SHRTEXEPATH="\"$1\""||\
SHRTEXEPATH="'$1'"
Expand Down Expand Up @@ -3770,11 +3770,11 @@ is_app_exist() {
do
[ -n "$(if [ -n "$args" ]
then
awk -v s="Exec='$LWRAP' '$1' $args" '$0==s' "$app" 2>/dev/null
awk -v s="Exec='$LWRAP' \"$1\" $args" '$0==s' "$app" 2>/dev/null
awk -v s="Exec='$LWRUN' '$1' $args" '$0==s' "$app" 2>/dev/null
awk -v s="Exec='$LWRUN' \"$1\" $args" '$0==s' "$app" 2>/dev/null
else
awk -v s="Exec='$LWRAP' '$1'" '$0==s' "$app" 2>/dev/null
awk -v s="Exec='$LWRAP' \"$1\"" '$0==s' "$app" 2>/dev/null
awk -v s="Exec='$LWRUN' '$1'" '$0==s' "$app" 2>/dev/null
awk -v s="Exec='$LWRUN' \"$1\"" '$0==s' "$app" 2>/dev/null
fi|head -1)" ] && ret=0 && echo "$app" && break
done
return $ret
Expand Down Expand Up @@ -4160,13 +4160,11 @@ lu_help() {
exit 1
fi
echo_help() {
[[ "$RUNSRC" =~ "lwrun" ]] && \
local LW_NAME="lwrap"
echo -e "
${GREEN}Lux Wine ${RED}v${LW_VERSION} ${GREEN}by $LW_DEVELOPERS
${RED}Usage:
$RED┌──[$GREEN$USER$YELLOW@$BLUE`uname -a|awk '{print$2}'`$RED]─[$GREEN$PWD$RED]
$RED└──╼ \$$GREEN $LW_NAME $BLUE{$LW_NAME arg} ${RED}blabla.exe $YELLOW{exe args}
$RED└──╼ \$$GREEN lwrun $BLUE{lwrun arg} ${RED}blabla.exe $YELLOW{exe args}
${RED}-explorer $GREEN Wine explorer
${RED}-cmd $GREEN Open CMD or open file in CMD
Expand Down Expand Up @@ -6915,44 +6913,6 @@ if [[ "$EUID" == 0 && "$ALLOW_ROOT" != 1 ]]
print_error yad "Don't run Lux Wine as root!"
exit 1
else
(if [[ "$RUNSRC" =~ "lwrun" ]]
then
lwait_fl="/tmp/.lwait.$RUNPID"
[[ -f "$lwait_fl" && ! -d "/proc/$RUNPID" ]] && \
rm -f "$lwait_fl"
if [ ! -f "$lwait_fl" ]
then
find_processes() {
processes="$(ls -l /proc/*/exe 2>/dev/null|grep ' ->')"
for ps in "${IGNPS[@]}"
do processes="$(grep -wv "$ps"<<<"$processes")"
done
}
IGNPS=(
'tee' 'ls' 'ssrv' 'cat' 'tini'
'sleep' 'gamemoded' 'bash' 'grep'
)
find_processes
wait_lwpids=100
while [[ "$wait_lwpids" -gt 0 && \
! -n "$processes" && -d "/proc/$LWPID" ]]
do
wait_lwpids="$(( $wait_lwpids - 1 ))"
sleep 0.01 2>/dev/null
find_processes
done
touch "$lwait_fl"
while [[ -f "$lwait_fl" && \
-n "$processes" && -d "/proc/$LWPID" ]]
do
sleep 1
find_processes
done
rm -f "$lwait_fl"
sleep 0.5
fi
fi) 2>/dev/null &
lwait_pid=$!
lite_init "$@"
case $1 in
-init) full_init "$@" ;;
Expand Down Expand Up @@ -6992,4 +6952,3 @@ if [[ "$EUID" == 0 && "$ALLOW_ROOT" != 1 ]]
*) lu_start "$@" ;;
esac
fi
wait "$lwait_pid" &>/dev/null
10 changes: 5 additions & 5 deletions lwrap/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Maintainer: VHSgunzo <vhsgunzo.github.io>

pkgname='lwrap'
pkgver='0.78.5'
pkgrel='5'
pkgver='0.80'
pkgrel='1'
pkgdesc='Lux Wine wrapper for RunImage container'
arch=('x86_64')
url='https://github.com/VHSgunzo/lux-wine'
Expand Down Expand Up @@ -41,18 +41,18 @@ optdepends=(
'lib32-opencl-icd-loader' 'opencl-icd-loader'
'lib32-llvm' 'wine-prefix-dotnet'
)
source=('lwrap' 'lwexec')
sha256sums=('SKIP' 'SKIP')
source=('lwrap')
sha256sums=('SKIP')
install='lwrap.install'

shopt -s extglob

package() {
install -dm755 "$pkgdir/usr/bin"
install -Dm755 "$pkgname" "$pkgdir/opt/$pkgname/bin/$pkgname"
install -Dm755 "lwexec" "$pkgdir/opt/$pkgname/bin/lwexec"
cp -ar --no-preserve=ownership "$(realpath ../../)"/!(.git*|$pkgname|lutris-wine) "$pkgdir/opt/$pkgname"
mv -f "$pkgdir/opt/$pkgname/lux-wine" "$pkgdir/opt/$pkgname/bin/lux-wine"
ln -sfr "$pkgdir/opt/$pkgname/bin/lux-wine" "$pkgdir/usr/bin/lux-wine"
ln -sfr "$pkgdir/opt/$pkgname/bin/$pkgname" "$pkgdir/usr/bin/$pkgname"
mkdir -p "$pkgdir/usr"/{lib,lib32}
ln -sfr "$pkgdir/usr/lib/syslog-ng/libcef.so" "$pkgdir/usr/lib/libcef.so"
Expand Down
109 changes: 0 additions & 109 deletions lwrap/lwexec

This file was deleted.

Loading

0 comments on commit faf1902

Please sign in to comment.