Release v3.6: harden Wine updater flow and zip cleanup

Author: d3nd3

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v3.6
+
+- Wine/Proton updater downloads: runtime Wine detection now biases asset selection toward `release_linux_wine.zip` during `sofbuddy_update download` (non-XP builds).
+- Auto-install launch hardening: reverted Wine `/unix` launch path and standardized `winstart` install command to `update_from_zip.cmd` to avoid repeated `Invalid Name` dialogs from `start` wrapper parsing.
+- Installer scripts: `update_from_zip.cmd` now prefers non-PowerShell extractors first (`tar`, `7z`, VBScript) and uses PowerShell only as fallback.
+- Post-install cleanup: both Windows and Linux/Wine update scripts now delete the extracted zip on successful install to prevent `sof_buddy/update/` accumulation.
+
 ## v3.5
 
 - Updater install: `sofbuddy_update_install` now detects Wine (`wine_get_version`) and prefers `sof_buddy/update_from_zip.sh` under Wine/Proton.

VERSION

@@ -1 +1 @@
-3.5
+3.6

hdr/version.h

@@ -7,4 +7,4 @@
     Increment version using: ./increment_version.sh
 */
 
-#define SOFBUDDY_VERSION "3.5"
+#define SOFBUDDY_VERSION "3.6"

rsrc/lin_scripts/update_from_zip.sh

@@ -44,6 +44,12 @@ fi
 
 echo
 echo "Update extraction complete."
+echo "Deleting used update zip..."
+if rm -f -- "${ZIP_PATH}"; then
+    echo "Deleted: ${ZIP_PATH}"
+else
+    echo "Warning: could not delete ${ZIP_PATH}"
+fi
 echo
 echo "Searching for old configuration to prune..."
 find "${ROOT_DIR}" -type f -name "sofbuddy.cfg" -print -delete 2>/dev/null || true

rsrc/win_scripts/update_from_zip.cmd

@@ -58,6 +58,13 @@ if errorlevel 1 (
 
 echo.
 echo Update extraction complete.
+echo Deleting used update zip...
+del /f /q "!ZIP_PATH!" >nul 2>&1
+if exist "!ZIP_PATH!" (
+    echo Warning: could not delete "!ZIP_PATH!".
+) else (
+    echo Deleted: !ZIP_PATH!
+)
 echo.
 echo Searching for old configuration to prune...
 for /r "%ROOT_DIR%" %%F in (sofbuddy.cfg) do (
@@ -75,12 +82,6 @@ exit /b 0
 :extract_zip
 set "ZIP=%~1"
 
-where powershell.exe >nul 2>&1
-if not errorlevel 1 (
-    powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "try { Expand-Archive -LiteralPath '%ZIP%' -DestinationPath '%ROOT_DIR%' -Force; exit 0 } catch { exit 1 }"
-    if not errorlevel 1 exit /b 0
-)
-
 where tar.exe >nul 2>&1
 if not errorlevel 1 (
     tar -xf "%ZIP%" -C "%ROOT_DIR%"
@@ -96,6 +97,12 @@ if not errorlevel 1 (
 call :extract_with_vbscript "%ZIP%"
 if not errorlevel 1 exit /b 0
 
+where powershell.exe >nul 2>&1
+if not errorlevel 1 (
+    powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "try { Expand-Archive -LiteralPath '%ZIP%' -DestinationPath '%ROOT_DIR%' -Force; exit 0 } catch { exit 1 }"
+    if not errorlevel 1 exit /b 0
+)
+
 exit /b 1
 
 :extract_with_vbscript

src/core/update_command.cpp

@@ -35,7 +35,6 @@ constexpr const char* kUpdateReleasesUrl = kUpdateReleasesUrlGitHub;
 #endif
 constexpr const char* kUpdateOutputDir = "sof_buddy/update";
 constexpr const char* kUpdateInstallScript = "sof_buddy/update_from_zip.cmd";
-constexpr const char* kUpdateInstallScriptWine = "sof_buddy/update_from_zip.sh";
 constexpr DWORD kUpdateTimeoutMs = 8000;
 constexpr uintptr_t kWinstartRva = 0x0040353C;
 
@@ -74,6 +73,7 @@ struct ReleaseInfo {
 };
 
 bool parse_url(const std::string& url, ParsedUrl& out, std::string& error);
+std::wstring utf8_to_wide(const std::string& value);
 
 bool is_regular_file(const char* path) {
     if (!path || !path[0]) return false;
@@ -86,6 +86,14 @@ bool is_running_under_wine() {
     return ntdll && GetProcAddress(ntdll, "wine_get_version");
 }
 
+bool prefer_linux_wine_release_zip() {
+#if defined(SOFBUDDY_XP_BUILD)
+    return false;
+#else
+    return is_running_under_wine();
+#endif
+}
+
 bool queue_winstart_command(const char* command) {
     if (!command || !command[0]) return false;
     char** slot = reinterpret_cast<char**>(rvaToAbsExe(reinterpret_cast<void*>(kWinstartRva)));
@@ -598,6 +606,7 @@ int score_release_zip_candidate(const std::string& url) {
     const bool is_linux_wine = (name.find("linux") != std::string::npos) ||
                                (name.find("wine") != std::string::npos);
     const bool is_xp = (name.find("xp") != std::string::npos);
+    const bool prefer_linux_wine = prefer_linux_wine_release_zip();
 
     int score = 0;
     if (is_release) score += 400;
@@ -618,9 +627,15 @@ int score_release_zip_candidate(const std::string& url) {
     if (is_windows && !is_xp) score -= 400;
     if (is_linux_wine) score -= 700;
 #else
-    if (is_windows && !is_xp) score += 1200;
-    if (is_windows && is_xp) score -= 700;
-    if (is_linux_wine) score -= 150;
+    if (prefer_linux_wine) {
+        if (is_linux_wine) score += 1200;
+        if (is_windows && !is_xp) score -= 150;
+        if (is_windows && is_xp) score -= 700;
+    } else {
+        if (is_windows && !is_xp) score += 1200;
+        if (is_windows && is_xp) score -= 700;
+        if (is_linux_wine) score -= 150;
+    }
 #endif
 
     return score;
@@ -636,12 +651,18 @@ bool zip_matches_build_preference(const std::string& url) {
     const bool is_linux_wine = (name.find("linux") != std::string::npos) ||
                                (name.find("wine") != std::string::npos);
     const bool is_xp = (name.find("xp") != std::string::npos);
+    const bool prefer_linux_wine = prefer_linux_wine_release_zip();
 
 #if defined(SOFBUDDY_XP_BUILD)
     if (is_windows && is_xp) return true;
     if (is_windows && !is_xp) return false;
     if (is_linux_wine) return false;
 #else
+    if (prefer_linux_wine) {
+        if (is_linux_wine) return true;
+        if (is_windows && !is_xp) return false;
+        if (is_windows && is_xp) return false;
+    }
     if (is_windows && !is_xp) return true;
     if (is_windows && is_xp) return false;
 #endif
@@ -1035,9 +1056,7 @@ void Cmd_SoFBuddy_Update_f(void) {
 void Cmd_SoFBuddy_UpdateInstall_f(void) {
     if (!orig_Cmd_ExecuteString) return;
     const bool wine = is_running_under_wine();
-    const char* script = wine ? kUpdateInstallScriptWine : kUpdateInstallScript;
-    if (!is_regular_file(script) && wine && is_regular_file(kUpdateInstallScript))
-        script = kUpdateInstallScript;
+    const char* script = kUpdateInstallScript;
     if (!is_regular_file(script)) {
         set_update_status("install script missing");
         PrintOut(PRINT_BAD, "sofbuddy_update_install: missing %s\n", script);
@@ -1050,18 +1069,12 @@ void Cmd_SoFBuddy_UpdateInstall_f(void) {
         return;
     }
     std::string command;
-    if (wine && std::strcmp(script, kUpdateInstallScriptWine) == 0) {
-        command = "/unix \"";
-        command += script;
-        command += "\" \"";
-        command += zip_path;
-        command += "\"";
-    } else {
-        command = script;
-        command += " \"";
-        command += zip_path;
-        command += "\"";
-    }
+    if (wine)
+        PrintOut(PRINT_DEV, "sofbuddy_update_install: Wine detected; using %s via winstart\n", script);
+    command = script;
+    command += " \"";
+    command += zip_path;
+    command += "\"";
 
     if (!queue_winstart_command(command.c_str())) {
         set_update_status("failed to queue install command");