Navis
- 2.2
+ 2.2.1
Быстрый клиент · Naive · Hy2 · AWG · Xray
diff --git a/internal/update/update.go b/internal/update/update.go
index a86f42a..d6a7bdf 100644
--- a/internal/update/update.go
+++ b/internal/update/update.go
@@ -17,7 +17,7 @@ import (
)
// CurrentVersion is the shipped client version.
-const CurrentVersion = "2.2.0"
+const CurrentVersion = "2.2.1"
// DefaultManifestURL is the update feed (hosted in the project git repo).
const DefaultManifestURL = "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/update.json"
diff --git a/scripts/install-macos.sh b/scripts/install-macos.sh
new file mode 100644
index 0000000..dd1d7a4
--- /dev/null
+++ b/scripts/install-macos.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+set -euo pipefail
+
+BASE="https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release"
+ARCH="$(uname -m)"
+
+case "$ARCH" in
+ arm64)
+ SUBDIR="darwin-arm64"
+ ;;
+ x86_64)
+ SUBDIR="darwin-amd64"
+ ;;
+ *)
+ echo "Неподдерживаемая архитектура: $ARCH" >&2
+ exit 1
+ ;;
+esac
+
+DEST="${1:-$HOME/Downloads/Navis.dmg}"
+UNIVERSAL="$BASE/darwin-universal/Navis.dmg"
+SPECIFIC="$BASE/$SUBDIR/Navis.dmg"
+
+echo "Mac: $ARCH"
+echo "Рекомендуется универсальный DMG (Intel + Apple Silicon)…"
+if curl -fL -o "$DEST" "$UNIVERSAL"; then
+ echo "Скачан: $DEST"
+else
+ echo "Универсальный DMG недоступен, скачиваю $SUBDIR…"
+ curl -fL -o "$DEST" "$SPECIFIC"
+fi
+
+open "$DEST"
+echo "Откройте диск и перетащите Navis.app в Программы."
diff --git a/server/README.md b/server/README.md
index 6066eac..21a66f3 100644
--- a/server/README.md
+++ b/server/README.md
@@ -6,6 +6,7 @@
- Windows: `…/dist/navis-release/Navis.exe`
- macOS arm64: `…/dist/navis-release/darwin-arm64/Navis`
- macOS amd64: `…/dist/navis-release/darwin-amd64/Navis`
+- macOS universal (рекомендуется): `…/dist/navis-release/darwin-universal/Navis.dmg`
Пример `dist/update.json` (multi-platform + legacy url для старых клиентов):
diff --git a/server/update.json b/server/update.json
index 05df1b6..e258e40 100644
--- a/server/update.json
+++ b/server/update.json
@@ -1,30 +1,42 @@
{
- "version": "2.2.0",
- "notes": "Компактный список нод с пингом (как Happ), автовыбор и подключение к серверу с лучшим пингом",
+ "version": "2.2.1",
+ "notes": "Универсальный macOS DMG (Intel + Apple Silicon), скрипт автоустановки, предупреждения при неверной архитектуре",
"platform": "windows-amd64",
"os": "windows",
"arch": "amd64",
"url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/Navis.exe",
- "sha256": "acd3a57cb52d745ecd0dc24074cfbd0299820d863ce00c2d4ce7753fb7dc73f3",
+ "sha256": "993e17d6390c8a4378e51016012006f18db1f6bd7c25957a4bf82fe31ab63473",
"mandatory": false,
"platforms": {
"windows-amd64": {
"url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/Navis.exe",
- "sha256": "acd3a57cb52d745ecd0dc24074cfbd0299820d863ce00c2d4ce7753fb7dc73f3",
+ "sha256": "993e17d6390c8a4378e51016012006f18db1f6bd7c25957a4bf82fe31ab63473",
"os": "windows",
"arch": "amd64"
},
"darwin-arm64": {
"url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/darwin-arm64/Navis",
- "sha256": "777564f1605209deb67b440a8f94667443498df38cef0a34a0ab8ab9922dab44",
+ "sha256": "b1589bffebb7cbeee17ca5a40cedb6ca614a3580be22488505a1403e1021c2b6",
"os": "darwin",
- "arch": "arm64"
+ "arch": "arm64",
+ "dmg_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/darwin-arm64/Navis.dmg",
+ "zip_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/darwin-arm64/Navis.app.zip"
},
"darwin-amd64": {
"url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/darwin-amd64/Navis",
- "sha256": "5d0b0e3a2edebdb26f78eb39a7a67c6d7d7fb46beaa737869a0fec1150da3935",
+ "sha256": "149258fbad816aa2e73384da492bc91e3bf6700d4d01d55c9f35a3f68998232c",
"os": "darwin",
- "arch": "amd64"
+ "arch": "amd64",
+ "dmg_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/darwin-amd64/Navis.dmg",
+ "zip_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/darwin-amd64/Navis.app.zip"
+ },
+ "darwin-universal": {
+ "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/darwin-universal/Navis",
+ "sha256": "37ceb0e47cd542dadcd406cedecc760d9aa71a40f0b109f81d560de3a4eba79",
+ "os": "darwin",
+ "arch": "universal",
+ "dmg_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/darwin-universal/Navis.dmg",
+ "zip_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/darwin-universal/Navis.app.zip"
}
}
}
diff --git a/tools/mklipo/main.go b/tools/mklipo/main.go
new file mode 100644
index 0000000..bdd09d3
--- /dev/null
+++ b/tools/mklipo/main.go
@@ -0,0 +1,105 @@
+// mklipo merges two Mach-O binaries into one macOS universal (fat) binary.
+package main
+
+import (
+ "encoding/binary"
+ "fmt"
+ "os"
+)
+
+const (
+ fatMagic = 0xCAFEBABE
+ cpuTypeX86_64 = 0x01000007
+ cpuTypeARM64 = 0x0100000c
+ fatArchSize = 20
+)
+
+type slice struct {
+ cpu, sub uint32
+ data []byte
+}
+
+func main() {
+ if len(os.Args) != 4 {
+ fmt.Fprintln(os.Stderr, "usage: mklipo