diff --git a/install.ps1 b/install.ps1 index 77c0034125..c1b19190f8 100644 --- a/install.ps1 +++ b/install.ps1 @@ -1027,35 +1027,6 @@ shell.Run cmd, 0, False } } - # Hotfix: patch install_python_stack.py for Windows GUI stdout - # The PyPI version crashes with OSError when stdout is piped from a GUI app. - # Copy our fixed version (bundled by Tauri) over the installed one. - # Remove this block once PyPI ships the fix from commit 18c5aae7. - if ($TauriMode) { - $rawPath = if ($PSCommandPath) { $PSCommandPath } else { $MyInvocation.ScriptName } - $scriptDir = Split-Path -Parent ($rawPath -replace '^\\\\\?\\', '') - $fixedPy = Join-Path $scriptDir "install_python_stack.py" - $target = Join-Path $VenvDir "Lib\site-packages\studio\install_python_stack.py" - $sentinel = "# UNSLOTH_DESKTOP_HOTFIX_APPLIED_v1" - $sentinelPattern = [regex]::Escape($sentinel) - if ((Test-Path $fixedPy) -and (Test-Path $target)) { - $installed = Get-Content $target -Raw - if ($installed -notmatch $sentinelPattern) { - Copy-Item $fixedPy $target -Force - Add-Content -Path $target -Value "`n$sentinel" - substep "patched install_python_stack.py (stdout fix)" - } else { - substep "install_python_stack.py already has stdout fix" - } - } elseif ((Test-Path $fixedPy) -and (Test-Path (Split-Path $target))) { - Copy-Item $fixedPy $target -Force - Add-Content -Path $target -Value "`n$sentinel" - substep "patched install_python_stack.py (stdout fix)" - } else { - Write-Host "[WARN] Could not patch install_python_stack.py (bundled file or target dir missing)" -ForegroundColor Yellow - } - } - # ── Run studio setup ── # setup.ps1 will handle installing Git, CMake, Visual Studio Build Tools, # CUDA Toolkit, Node.js, and other dependencies automatically via winget. @@ -1095,7 +1066,7 @@ shell.Run cmd, 0, False if ($setupExit -ne 0) { Write-TauriLog "ERROR" "unsloth studio setup failed (exit code $setupExit)" Write-Host "[ERROR] unsloth studio setup failed (exit code $setupExit)" -ForegroundColor Red - return + exit $setupExit } # ── Expose `unsloth` via a shim dir containing only unsloth.exe ── diff --git a/studio/src-tauri/tauri.conf.json b/studio/src-tauri/tauri.conf.json index 705cf0ea94..497e15731e 100644 --- a/studio/src-tauri/tauri.conf.json +++ b/studio/src-tauri/tauri.conf.json @@ -44,8 +44,7 @@ "targets": ["app", "appimage", "deb", "dmg", "nsis"], "resources": { "../../install.sh": "install.sh", - "../../install.ps1": "install.ps1", - "../install_python_stack.py": "install_python_stack.py" + "../../install.ps1": "install.ps1" }, "icon": [ "icons/32x32.png", diff --git a/studio/src-tauri/windows/branding/nsis-header.bmp b/studio/src-tauri/windows/branding/nsis-header.bmp index 7eacdce7db..aef7fea67b 100644 Binary files a/studio/src-tauri/windows/branding/nsis-header.bmp and b/studio/src-tauri/windows/branding/nsis-header.bmp differ diff --git a/studio/src-tauri/windows/branding/nsis-sidebar.bmp b/studio/src-tauri/windows/branding/nsis-sidebar.bmp index c3bd480fc8..fe66d78a19 100644 Binary files a/studio/src-tauri/windows/branding/nsis-sidebar.bmp and b/studio/src-tauri/windows/branding/nsis-sidebar.bmp differ