mirrors/nginx-ui
1
0
Fork 0
mirror of https://github.com/0xJacky/nginx-ui.git synced 2025-05-10 18:05:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix(upgrader): adjust old executable path handling for Windows in commit restart process
Some checks failed
Build / build_app (push) Waiting to run
Details
Build / build (386, linux) (push) Blocked by required conditions
Details
Build / build (386, windows) (push) Blocked by required conditions
Details
Build / build (amd64, darwin) (push) Blocked by required conditions
Details
Build / build (amd64, linux) (push) Blocked by required conditions
Details
Build / build (amd64, windows) (push) Blocked by required conditions
Details
Build / build (arm, 5, linux) (push) Blocked by required conditions
Details
Build / build (arm, 6, linux) (push) Blocked by required conditions
Details
Build / build (arm, 7, linux) (push) Blocked by required conditions
Details
Build / build (arm64, darwin) (push) Blocked by required conditions
Details
Build / build (arm64, linux) (push) Blocked by required conditions
Details
Build / build (arm64, windows) (push) Blocked by required conditions
Details
Build / build (loong64, linux) (push) Blocked by required conditions
Details
Build / build (mips, linux) (push) Blocked by required conditions
Details
Build / build (mips64, linux) (push) Blocked by required conditions
Details
Build / build (mips64le, linux) (push) Blocked by required conditions
Details
Build / build (mipsle, linux) (push) Blocked by required conditions
Details
Build / build (riscv64, linux) (push) Blocked by required conditions
Details
Build / docker-build (push) Blocked by required conditions
Details
CodeQL / Analyze (go) (push) Waiting to run
Details
CodeQL / Analyze (javascript-typescript) (push) Waiting to run
Details
Build Documents / build (push) Has been cancelled
Details

Browse source
This commit is contained in:
Jacky 2025-05-05 13:57:56 +00:00
parent f04e02cd25
commit e69911f97d
No known key found for this signature in database
GPG key ID: 215C21B10DF38B4D
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
internal/upgrader/test_commit_restart.go
View file

@ -19,7 +19,10 @@ func (u *Upgrader) TestCommitAndRestart() error {
testBinaryPath := filepath.Join(exDir, "nginx-ui.test")
// Create temporary old file path
oldExe := filepath.Join(exDir, ".nginx-ui.old."+strconv.FormatInt(time.Now().Unix(), 10))
oldExe := ""
if runtime.GOOS == "windows" {
oldExe = filepath.Join(exDir, ".nginx-ui.old."+strconv.FormatInt(time.Now().Unix(), 10))
}
// Setup update options
opts := selfupdate.Options{
@ -85,10 +88,7 @@ func (u *Upgrader) TestCommitAndRestart() error {
return err
}
if runtime.GOOS != "windows" {
_ = os.Remove(oldExe)
_ = os.Remove(testBinaryPath)
}
_ = os.Remove(testBinaryPath)
// Wait for file to be written
time.Sleep(1 * time.Second)

9
internal/upgrader/upgrade.go
View file

@ -218,7 +218,10 @@ func (u *Upgrader) PerformCoreUpgrade(tarPath string) (err error) {
}
defer updateInProgress.Store(false)
oldExe := filepath.Join(filepath.Dir(u.ExPath), ".nginx-ui.old."+strconv.FormatInt(time.Now().Unix(), 10))
oldExe := ""
if runtime.GOOS != "windows" {
oldExe = filepath.Join(filepath.Dir(u.ExPath), ".nginx-ui.old."+strconv.FormatInt(time.Now().Unix(), 10))
}
opts := selfupdate.Options{
OldSavePath: oldExe,
@ -272,10 +275,6 @@ func (u *Upgrader) PerformCoreUpgrade(tarPath string) (err error) {
return err
}
if runtime.GOOS != "windows" {
_ = os.Remove(oldExe)
}
// wait for the file to be written
time.Sleep(1 * time.Second)