colin
/
pocketbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[#2589] added .exe fallback to the selfupdate cmd and replaced path with filepath

This commit is contained in:
Gani Georgiev 2023-05-28 21:57:12 +03:00
parent e3876c0e13
commit 9a1354ae62
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,3 +1,8 @@
## v0.16.4-WIP
- Fixed the selfupdate command not working on Windows due to missing `.exe` in the extracted binary path ([#2589](https://github.com/pocketbase/pocketbase/discussions/2589)).
## v0.16.3 ## v0.16.3
- Fixed schema fields sort not working on Safari/Gnome Web ([#2567](https://github.com/pocketbase/pocketbase/issues/2567)). - Fixed schema fields sort not working on Safari/Gnome Web ([#2567](https://github.com/pocketbase/pocketbase/issues/2567)).

19
plugins/ghupdate/ghupdate.go
View File

@ -11,7 +11,6 @@ import (
"log" "log"
"net/http" "net/http"
"os" "os"
"path"
"path/filepath" "path/filepath"
"runtime" "runtime"
"strconv" "strconv"
@ -38,7 +37,8 @@ type Options struct {
// Repo specifies the name of the repository (default to "pocketbase"). // Repo specifies the name of the repository (default to "pocketbase").
Repo string Repo string
// ArchiveExecutable specifies the name of the executable file in the release archive (default to "pocketbase"). // ArchiveExecutable specifies the name of the executable file in the release archive
// (default to "pocketbase"; an additional ".exe" check is also performed as a fallback).
ArchiveExecutable string ArchiveExecutable string
// Optional context to use when fetching and downloading the latest release. // Optional context to use when fetching and downloading the latest release.
@ -154,20 +154,20 @@ func (p *plugin) update(withBackup bool) error {
return err return err
} }
releaseDir := path.Join(p.app.DataDir(), core.LocalTempDirName) releaseDir := filepath.Join(p.app.DataDir(), core.LocalTempDirName)
defer os.RemoveAll(releaseDir) defer os.RemoveAll(releaseDir)
color.Yellow("Downloading %s...", asset.Name) color.Yellow("Downloading %s...", asset.Name)
// download the release asset // download the release asset
assetZip := path.Join(releaseDir, asset.Name) assetZip := filepath.Join(releaseDir, asset.Name)
if err := downloadFile(p.options.Context, p.options.HttpClient, asset.DownloadUrl, assetZip); err != nil { if err := downloadFile(p.options.Context, p.options.HttpClient, asset.DownloadUrl, assetZip); err != nil {
return err return err
} }
color.Yellow("Extracting %s...", asset.Name) color.Yellow("Extracting %s...", asset.Name)
extractDir := path.Join(releaseDir, "extracted_"+asset.Name) extractDir := filepath.Join(releaseDir, "extracted_"+asset.Name)
defer os.RemoveAll(extractDir) defer os.RemoveAll(extractDir)
if err := archive.Extract(assetZip, extractDir); err != nil { if err := archive.Extract(assetZip, extractDir); err != nil {
@ -183,7 +183,14 @@ func (p *plugin) update(withBackup bool) error {
renamedOldExec := oldExec + ".old" renamedOldExec := oldExec + ".old"
defer os.Remove(renamedOldExec) defer os.Remove(renamedOldExec)
newExec := path.Join(extractDir, p.options.ArchiveExecutable) newExec := filepath.Join(extractDir, p.options.ArchiveExecutable)
if _, err := os.Stat(newExec); err != nil {
// try again with an .exe extension
newExec = newExec + ".exe"
if _, err := os.Stat(newExec); err != nil {
return fmt.Errorf("The executable in the extracted path is missing or it is inaccessible: %w", err)
}
}
// rename the current executable // rename the current executable
if err := os.Rename(oldExec, renamedOldExec); err != nil { if err := os.Rename(oldExec, renamedOldExec); err != nil {