Fix 4.2.7+1: restore UTF-8 in update.go (em-dash/RU strings) and rebuild Windows binaries + feed SHA.
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Vendored
+2
-2
@@ -5,7 +5,7 @@
|
|||||||
"os": "windows",
|
"os": "windows",
|
||||||
"arch": "amd64",
|
"arch": "amd64",
|
||||||
"url": "https://git.de4ima.uk/Evilfox/navi/raw/branch/Windows/dist/navis-release/windows/EvilFox.exe",
|
"url": "https://git.de4ima.uk/Evilfox/navi/raw/branch/Windows/dist/navis-release/windows/EvilFox.exe",
|
||||||
"sha256": "dd867e27845fafa9417e1658919fc6613947db3c4677c1f35a270cdc72b3c762",
|
"sha256": "f49bf956981031cf11234791090216bb23588c9b5f82e225be838a602c8159f1",
|
||||||
"mandatory": false,
|
"mandatory": false,
|
||||||
"platforms": {
|
"platforms": {
|
||||||
"android": {
|
"android": {
|
||||||
@@ -40,7 +40,7 @@
|
|||||||
},
|
},
|
||||||
"windows-amd64": {
|
"windows-amd64": {
|
||||||
"url": "https://git.de4ima.uk/Evilfox/navi/raw/branch/Windows/dist/navis-release/windows/EvilFox.exe",
|
"url": "https://git.de4ima.uk/Evilfox/navi/raw/branch/Windows/dist/navis-release/windows/EvilFox.exe",
|
||||||
"sha256": "dd867e27845fafa9417e1658919fc6613947db3c4677c1f35a270cdc72b3c762",
|
"sha256": "f49bf956981031cf11234791090216bb23588c9b5f82e225be838a602c8159f1",
|
||||||
"os": "windows",
|
"os": "windows",
|
||||||
"arch": "amd64"
|
"arch": "amd64"
|
||||||
}
|
}
|
||||||
|
|||||||
BIN
Binary file not shown.
Vendored
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
Vendored
+2
-2
@@ -5,7 +5,7 @@
|
|||||||
"os": "windows",
|
"os": "windows",
|
||||||
"arch": "amd64",
|
"arch": "amd64",
|
||||||
"url": "https://git.de4ima.uk/Evilfox/navi/raw/branch/Windows/dist/navis-release/windows/EvilFox.exe",
|
"url": "https://git.de4ima.uk/Evilfox/navi/raw/branch/Windows/dist/navis-release/windows/EvilFox.exe",
|
||||||
"sha256": "dd867e27845fafa9417e1658919fc6613947db3c4677c1f35a270cdc72b3c762",
|
"sha256": "f49bf956981031cf11234791090216bb23588c9b5f82e225be838a602c8159f1",
|
||||||
"mandatory": false,
|
"mandatory": false,
|
||||||
"platforms": {
|
"platforms": {
|
||||||
"android": {
|
"android": {
|
||||||
@@ -40,7 +40,7 @@
|
|||||||
},
|
},
|
||||||
"windows-amd64": {
|
"windows-amd64": {
|
||||||
"url": "https://git.de4ima.uk/Evilfox/navi/raw/branch/Windows/dist/navis-release/windows/EvilFox.exe",
|
"url": "https://git.de4ima.uk/Evilfox/navi/raw/branch/Windows/dist/navis-release/windows/EvilFox.exe",
|
||||||
"sha256": "dd867e27845fafa9417e1658919fc6613947db3c4677c1f35a270cdc72b3c762",
|
"sha256": "f49bf956981031cf11234791090216bb23588c9b5f82e225be838a602c8159f1",
|
||||||
"os": "windows",
|
"os": "windows",
|
||||||
"arch": "amd64"
|
"arch": "amd64"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// CurrentVersion is the product/semver used for update eligibility (feed "version").
|
// CurrentVersion is the product/semver used for update eligibility (feed "version").
|
||||||
// Keep major.minor.patch only — no build suffix here.
|
// Keep major.minor.patch only — no build suffix here.
|
||||||
const CurrentVersion = "4.2.7"
|
const CurrentVersion = "4.2.7"
|
||||||
|
|
||||||
// BuildNumber is the monotonic build within CurrentVersion (Windows FileVersion 4th part,
|
// BuildNumber is the monotonic build within CurrentVersion (Windows FileVersion 4th part,
|
||||||
@@ -75,7 +75,7 @@ type Status struct {
|
|||||||
Checking bool `json:"checking,omitempty"`
|
Checking bool `json:"checking,omitempty"`
|
||||||
Error string `json:"error,omitempty"`
|
Error string `json:"error,omitempty"`
|
||||||
ManifestURL string `json:"manifest_url"`
|
ManifestURL string `json:"manifest_url"`
|
||||||
StoreManaged bool `json:"store_managed,omitempty"` // MSIX / Microsoft Store — no in-app updates
|
StoreManaged bool `json:"store_managed,omitempty"` // MSIX / Microsoft Store — no in-app updates
|
||||||
}
|
}
|
||||||
|
|
||||||
// PlatformKey is "GOOS-GOARCH", e.g. windows-amd64, darwin-arm64.
|
// PlatformKey is "GOOS-GOARCH", e.g. windows-amd64, darwin-arm64.
|
||||||
@@ -86,7 +86,7 @@ func PlatformKey() string {
|
|||||||
// AssetFor returns download URL + checksum for the given platform key.
|
// AssetFor returns download URL + checksum for the given platform key.
|
||||||
//
|
//
|
||||||
// Rules (critical):
|
// Rules (critical):
|
||||||
// - Only the asset for this OS/arch is considered — never another OS.
|
// - Only the asset for this OS/arch is considered — never another OS.
|
||||||
// - If the feed has a newer version but no matching platform asset, ok=false
|
// - If the feed has a newer version but no matching platform asset, ok=false
|
||||||
// (caller must treat Available as false).
|
// (caller must treat Available as false).
|
||||||
// - Darwin may fall back to "darwin-universal" when the exact arch key is absent.
|
// - Darwin may fall back to "darwin-universal" when the exact arch key is absent.
|
||||||
@@ -196,7 +196,7 @@ func Check(ctx context.Context, manifestURL string) (Status, error) {
|
|||||||
if IsStorePackaged() {
|
if IsStorePackaged() {
|
||||||
st.StoreManaged = true
|
st.StoreManaged = true
|
||||||
st.Available = false
|
st.Available = false
|
||||||
st.Notes = "Обновления через Microsoft Store"
|
st.Notes = "Обновления через Microsoft Store"
|
||||||
return st, nil
|
return st, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -212,7 +212,7 @@ func Check(ctx context.Context, manifestURL string) (Status, error) {
|
|||||||
url, sha, ok := m.AssetFor(key)
|
url, sha, ok := m.AssetFor(key)
|
||||||
if !ok {
|
if !ok {
|
||||||
// Higher feed version for another OS must NOT count as available here.
|
// Higher feed version for another OS must NOT count as available here.
|
||||||
st.Error = fmt.Sprintf("нет сборки для %s", key)
|
st.Error = fmt.Sprintf("нет сборки для %s", key)
|
||||||
st.Available = false
|
st.Available = false
|
||||||
return st, nil
|
return st, nil
|
||||||
}
|
}
|
||||||
@@ -254,7 +254,7 @@ func productParts(v string) [3]int {
|
|||||||
|
|
||||||
func splitVer(v string) []int {
|
func splitVer(v string) []int {
|
||||||
v = strings.TrimPrefix(strings.TrimSpace(v), "v")
|
v = strings.TrimPrefix(strings.TrimSpace(v), "v")
|
||||||
// Strip build metadata: 2.7.2+1 / 2.7.2-beta в†’ compare product only.
|
// Strip build metadata: 2.7.2+1 / 2.7.2-beta → compare product only.
|
||||||
if i := strings.IndexAny(v, "+-"); i >= 0 {
|
if i := strings.IndexAny(v, "+-"); i >= 0 {
|
||||||
v = v[:i]
|
v = v[:i]
|
||||||
}
|
}
|
||||||
@@ -353,10 +353,10 @@ func prepareDownload(ctx context.Context, manifestURL string) (latest, url, sha,
|
|||||||
if st.Error != "" {
|
if st.Error != "" {
|
||||||
return "", "", "", "", "", fmt.Errorf("%s", st.Error)
|
return "", "", "", "", "", fmt.Errorf("%s", st.Error)
|
||||||
}
|
}
|
||||||
return "", "", "", "", "", fmt.Errorf("уже актуальная версия %s (канал %s)", DisplayVersion(), st.Latest)
|
return "", "", "", "", "", fmt.Errorf("уже актуальная версия %s (канал %s)", DisplayVersion(), st.Latest)
|
||||||
}
|
}
|
||||||
if !allowedDownloadURL(st.URL) {
|
if !allowedDownloadURL(st.URL) {
|
||||||
return "", "", "", "", "", fmt.Errorf("URL обновления должен быть на git.de4ima.uk, git.evilfox.cc или files.de4ima.uk")
|
return "", "", "", "", "", fmt.Errorf("URL обновления должен быть на git.de4ima.uk, git.evilfox.cc или files.de4ima.uk")
|
||||||
}
|
}
|
||||||
exe, err := os.Executable()
|
exe, err := os.Executable()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
+2
-2
@@ -5,7 +5,7 @@
|
|||||||
"os": "windows",
|
"os": "windows",
|
||||||
"arch": "amd64",
|
"arch": "amd64",
|
||||||
"url": "https://git.de4ima.uk/Evilfox/navi/raw/branch/Windows/dist/navis-release/windows/EvilFox.exe",
|
"url": "https://git.de4ima.uk/Evilfox/navi/raw/branch/Windows/dist/navis-release/windows/EvilFox.exe",
|
||||||
"sha256": "dd867e27845fafa9417e1658919fc6613947db3c4677c1f35a270cdc72b3c762",
|
"sha256": "f49bf956981031cf11234791090216bb23588c9b5f82e225be838a602c8159f1",
|
||||||
"mandatory": false,
|
"mandatory": false,
|
||||||
"platforms": {
|
"platforms": {
|
||||||
"android": {
|
"android": {
|
||||||
@@ -40,7 +40,7 @@
|
|||||||
},
|
},
|
||||||
"windows-amd64": {
|
"windows-amd64": {
|
||||||
"url": "https://git.de4ima.uk/Evilfox/navi/raw/branch/Windows/dist/navis-release/windows/EvilFox.exe",
|
"url": "https://git.de4ima.uk/Evilfox/navi/raw/branch/Windows/dist/navis-release/windows/EvilFox.exe",
|
||||||
"sha256": "dd867e27845fafa9417e1658919fc6613947db3c4677c1f35a270cdc72b3c762",
|
"sha256": "f49bf956981031cf11234791090216bb23588c9b5f82e225be838a602c8159f1",
|
||||||
"os": "windows",
|
"os": "windows",
|
||||||
"arch": "amd64"
|
"arch": "amd64"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user