v0.78.2.3

CHANGELOG.md

@@ -1,6 +1,8 @@
 # v0.78.2.3
 
 * Update [lwrun](https://huggingface.co/lux-wine/lwrun/tree/main/releases/v0.39.1) packages
+* Update `lwrap`
+* Update [lw-runtime](https://github.com/VHSgunzo/lw-runtime/releases/tag/v0.0.2) `v0.0.2`
 * Reduce the size of the `lwrun` installer
 * Revert/replace `mesa-tkg-git` with `mesa` in `lwrun`
 * Fix prefix restore on first run with `-init`

lutris-wine

@@ -1 +1 @@
-LW_VERSION="0.78.2.2"
+LW_VERSION="0.78.2.3"

lux-wine

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-export LW_VERSION="0.78.2.2"
+export LW_VERSION="0.78.2.3"
 export LW_DEVELOPERS="VHSgunzo"
 
 export RED='\033[1;91m'

lwrap/lwrap

@@ -235,6 +235,20 @@ is_not_pts_home() {
 }
 
 try_install_lwrun() {
+    finalize_install() {
+        chmod u+x "$LWRUN"
+        ln_lwrun
+        info_msg "lwrun installed!"
+        if [ ! -n "$TMP_LWRUN" ] && \
+            is_net_conn
+            then
+                update_lwrap
+                LWRUN_INSTALLED=1 \
+                "$LWRAP" --install
+        fi
+        try_shutdown_lw && \
+        return 0||return 1
+    }
     if is_not_pts_home
         then
             REALP_LWRUN="$(readrealpath "$LWRUN")"
@@ -245,19 +259,7 @@ try_install_lwrun() {
                     info_msg "Installing lwrun..."
                     mkdir -p "$LWBIN_DIR"
                     if mv_lwrun "$RUNSRCRPTH" "$LWRUN"
-                        then
-                            chmod u+x "$LWRUN"
-                            ln_lwrun
-                            info_msg "lwrun installed!"
-                            if [ ! -n "$TMP_LWRUN" ] && \
-                                is_net_conn
-                                then
-                                    update_lwrap
-                                    LWRUN_INSTALLED=1 \
-                                    "$LWRAP" --install
-                            fi
-                            try_shutdown_lw && \
-                            return 0||return 1
+                        then finalize_install
                         else
                             error_msg "Failed to install lwrun!"
                             is_lwrun && \
@@ -269,6 +271,8 @@ try_install_lwrun() {
                     ln -sf "$RUNSRCRPTH" "$LWRUN"
                     ln_lwrun
                     return 0
+            elif [[ ! -n "$TMP_LWRUN" && "$LWRUN_PKG" == 1 ]]
+                then finalize_install
             fi
     fi
 }

lwrun-pkg/RunDir/Run.sh

@@ -0,0 +1,71 @@
+#!/usr/bin/env bash
+
+which_exe() { command -v "$@" ; }
+
+try_mv_nvdrv() {
+    mkdir -p "$NVIDIA_DRIVERS_DIR"
+    if [ -w "$1" ]
+        then mv -f "$1" "$NVIDIA_DRIVERS_DIR/" 2>/dev/null
+        else cp -rf "$1" "$NVIDIA_DRIVERS_DIR/" 2>/dev/null
+    fi
+}
+
+if [[ -n "$RUNOFFSET" && -n "$ARGV0" ]]
+    then
+        RUNSTATIC="$RUNDIR/static"
+        [ "$SYS_TOOLS" == 1 ] && \
+            export PATH="$PATH:$RUNSTATIC"||\
+            export PATH="$RUNSTATIC:$PATH"
+        if [ ! -n "$RUNIMAGE" ] # KDE Neon, CachyOS, Puppy Linux bug
+            then
+                if [ -x "$(realpath "$ARGV0" 2>/dev/null)" ]
+                    then RUNIMAGE="$(realpath "$ARGV0" 2>/dev/null)"
+                elif [ -x "$(realpath "$(which_exe "$ARGV0")" 2>/dev/null)" ]
+                    then RUNIMAGE="$(realpath "$(which_exe "$ARGV0")" 2>/dev/null)"
+                else RUNIMAGE="$ARGV0"
+                fi
+        fi
+        PRUNDIR="$(dirname "$RUNIMAGE" 2>/dev/null)"
+    else
+        [ ! -d "$RUNDIR" ] && \
+        RUNDIR="$(dirname "$(realpath "$0" 2>/dev/null)" 2>/dev/null)"
+        RUNSTATIC="$RUNDIR/static"
+        [ "$SYS_TOOLS" == 1 ] && \
+            export PATH="$PATH:$RUNSTATIC"||\
+            export PATH="$RUNSTATIC:$PATH"
+        PRUNDIR="$(realpath "$RUNDIR/../" 2>/dev/null)"
+fi
+
+export LWRUN_PKG=1
+LW_DIR="$HOME/.local/share/LuxWine"
+LWBIN_DIR="$LW_DIR/bin"
+LWRUN="$LWBIN_DIR/lwrun"
+NVIDIA_DRIVERS_DIR="$LW_DIR/bin/nvidia-drivers"
+
+mkdir -p "$LWBIN_DIR"
+tar -I 'zstd -T0 --progress' -xf "$RUNDIR/lwrun.tar.zst" -C "$LWBIN_DIR"
+
+if [[ "$SANDBOX_HOME" != 1 && \
+      "$SANDBOX_HOME_DL" != 1 && \
+      ! -d "$SANDBOXHOMEDIR/lwrap" && \
+      "$PORTABLE_HOME" != 1 && \
+      "$TMP_HOME" != 1 && \
+      "$TMP_HOME_DL" != 1 && \
+      ! -d "$PORTABLEHOMEDIR/lwrap" ]]
+    then
+        nvidia_version="$(cat /sys/module/nvidia/version 2>/dev/null)"
+        if [ -n "$nvidia_version" ]
+            then
+                if [[ ! -d "$NVIDIA_DRIVERS_DIR/$nvidia_version" && \
+                      ! -f "$NVIDIA_DRIVERS_DIR/$nvidia_version.nv.drv" ]]
+                    then
+                        if [ -d "$PRUNDIR/$nvidia_version" ]
+                            then try_mv_nvdrv "$PRUNDIR/$nvidia_version"
+                        elif [ -f "$PRUNDIR/$nvidia_version.nv.drv" ]
+                            then try_mv_nvdrv "$PRUNDIR/$nvidia_version.nv.drv"
+                        fi
+                fi
+        fi
+fi
+
+exec "$LWRUN" -init

lwpkg/RunDir/static/.binaries_version → lwrun-pkg/RunDir/static/.binaries_version

@@ -1,5 +1,10 @@
 [coreutils](https://github.com/VHSgunzo/coreutils-static) 9.3 (musl):
+    cat
+    cp
+    dirname
     mkdir
+    mv
+    realpath
 (musl):
     [tar](https://github.com/VHSgunzo/tar-static) 1.34
     [bash](https://github.com/robxu9/bash-static) 5.2.015-1.2.3-2

lwpkg/build.sh → lwrun-pkg/build.sh

@@ -6,10 +6,16 @@ RUNTIME='runtime-fuse2-all'
 RUNTIMESIZE=($(du -sb "$RUNTIME" 2>/dev/null))
 
 # RunDir/static
-#     bash      # https://github.com/robxu9/bash-static
-#     mkdir     # https://github.com/VHSgunzo/coreutils-static
-#     tar       # https://github.com/VHSgunzo/tar-static
-#     zstd      # https://github.com/VHSgunzo/zstd-static
+#     bash        https://github.com/robxu9/bash-static
+#     coreutils   https://github.com/VHSgunzo/coreutils-static :
+#         cat
+#         cp
+#         dirname
+#         mkdir
+#         mv
+#         realpath
+#     tar         https://github.com/VHSgunzo/tar-static
+#     zstd        https://github.com/VHSgunzo/zstd-static
 
 # https://github.com/VHSgunzo/Run-wrapper
 # RunDir/Run