GithubBackup/MyGoNavi
1
0
Fork 0
mirror of https://github.com/Syngnat/GoNavi.git synced 2026-05-21 08:10:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

🐛 fix(update): 修复 Windows 更新脚本安装失败

Browse Source 
Fixes #328
This commit is contained in:
Syngnat
2026-04-11 21:53:52 +08:00
parent fb500ee33b
commit 426ef3bcf6
3 changed files with 82 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
internal/app/methods_update_windows_script_test.go
View File

@@ -1,6 +1,7 @@
package app
import (
"os/exec"
"strings"
"testing"
)
@@ -55,15 +56,15 @@ func TestBuildWindowsScriptWin10Fixes(t *testing.T) {
}{
{"cooldown after process exit", `timeout /t 3 /nobreak >nul`},
{"cooldown log", `call :log cooldown finished, starting file replace`},
{"rename-before-replace strategy", `ren "%TARGET%" "%TARGET_NAME%.old"`},
{"rename-before-replace strategy", `move /Y "%TARGET%" "%TARGET_OLD%"`},
{"copy after rename", `copy /Y "%SOURCE_EXE%" "%TARGET%"`},
{"restore on copy failure", `ren "%TARGET_NAME%.old" "%TARGET_NAME%"`},
{"restore on copy failure", `move /Y "%TARGET_OLD%" "%TARGET%"`},
{"direct move fallback", `call :log rename strategy failed, trying direct move`},
{"exponential backoff tier 1", `if !RETRY! GEQ 3 set /a WAIT=2`},
{"exponential backoff tier 2", `if !RETRY! GEQ 6 set /a WAIT=3`},
{"exponential backoff tier 3", `if !RETRY! GEQ 9 set /a WAIT=5`},
{"retry limit 15", `if !RETRY! LSS 15`},
{"cleanup old file", `del /F /Q "%TARGET%.old"`},
{"cleanup old file", `del /F /Q "%TARGET_OLD%"`},
}
for _, fix := range win10Fixes {
if !strings.Contains(script, fix.token) {
@@ -72,3 +73,59 @@ func TestBuildWindowsScriptWin10Fixes(t *testing.T) {
}
}
func TestBuildWindowsScriptUsesCRLFLineEndings(t *testing.T) {
script := buildWindowsScript(
`C:\tmp\GoNavi-v0.5.0-windows-amd64.exe`,
`C:\Program Files\GoNavi\GoNavi.exe`,
`C:\Program Files\GoNavi\.gonavi-update-windows-v0.5.0`,
`C:\Program Files\GoNavi\logs\update-install.log`,
99999,
)
if !strings.Contains(script, "\r\n") {
t.Fatalf("windows update script should use CRLF line endings")
}
if strings.Contains(script, "@echo off\nsetlocal") {
t.Fatalf("windows update script should not contain LF-only line endings")
}
}
func TestBuildWindowsScriptUsesDelayedErrorlevelInsideBlocks(t *testing.T) {
script := buildWindowsScript(
`C:\tmp\GoNavi-v0.5.0-windows-amd64.zip`,
`C:\Program Files\GoNavi\GoNavi.exe`,
`C:\Program Files\GoNavi\.gonavi-update-windows-v0.5.0`,
`C:\Program Files\GoNavi\logs\update-install.log`,
99999,
)
for _, token := range []string{
`if !ERRORLEVEL! NEQ 0 (`,
`powershell -NoProfile -ExecutionPolicy Bypass -Command "Start-Process -FilePath '%TARGET%'" >> "%LOG_FILE%" 2>&1`,
`set "TARGET_OLD=%TARGET%.old"`,
} {
if !strings.Contains(script, token) {
t.Fatalf("windows update script missing token: %s\nscript:\n%s", token, script)
}
}
}
func TestBuildWindowsLaunchCommandUsesDirectCall(t *testing.T) {
cmd := buildWindowsLaunchCommand(`C:\tmp\gonavi-update\update.cmd`)
if !strings.EqualFold(cmd.Args[0], cmd.Path) && !strings.HasSuffix(strings.ToLower(cmd.Path), `\cmd.exe`) {
t.Fatalf("unexpected command path: %s", cmd.Path)
}
want := []string{"cmd.exe", "/D", "/C", "call", `C:\tmp\gonavi-update\update.cmd`}
if len(cmd.Args) != len(want) {
t.Fatalf("unexpected arg length: got %d want %d, args=%v", len(cmd.Args), len(want), cmd.Args)
}
for i := range want {
if cmd.Args[i] != want[i] {
t.Fatalf("unexpected arg[%d]: got %q want %q", i, cmd.Args[i], want[i])
}
}
}
var _ = exec.ErrNotFound