From 481abdf41d4904cd661dd0ab2d412d9fb5ecdfc4 Mon Sep 17 00:00:00 2001
From: Toby <tobyxdd@gmail.com>
Date: Sun, 8 Aug 2021 16:31:20 -0700
Subject: [PATCH] Better build naming & notun README

---
 .github/workflows/release-tun.yml | 22 +++++++++++-----------
 .github/workflows/release.yml     | 12 ++++++------
 README.md                         |  3 +++
 README.zh.md                      |  2 ++
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/release-tun.yml b/.github/workflows/release-tun.yml
index de7d88a..f0b56cc 100644
--- a/.github/workflows/release-tun.yml
+++ b/.github/workflows/release-tun.yml
@@ -34,7 +34,7 @@ jobs:
           xgo_version: latest
           go_version: latest
           dest: dist
-          prefix: hysteria-tun
+          prefix: hysteria
           targets: linux/amd64,linux/386,linux/arm-5,linux/arm-7,linux/arm64,linux/mipsle,darwin-10.12/amd64,darwin-10.12/arm64,windows-6.0/amd64,windows-6.0/386
           ldflags: -w -s -X main.appVersion=${{ env.GIT_TAG_NAME }} -X main.appCommit=${{ github.sha }} -X main.appDate=${{ env.TIME }}
           pkg: cmd
@@ -46,13 +46,13 @@ jobs:
           gzip: false
           allow_override: true
           files: >
-            ./dist/hysteria-tun-linux-amd64
-            ./dist/hysteria-tun-linux-386
-            ./dist/hysteria-tun-linux-arm-5
-            ./dist/hysteria-tun-linux-arm-7
-            ./dist/hysteria-tun-linux-arm64
-            ./dist/hysteria-tun-linux-mipsle
-            ./dist/hysteria-tun-darwin-10.12-amd64
-            ./dist/hysteria-tun-darwin-10.12-arm64
-            ./dist/hysteria-tun-windows-6.0-amd64.exe
-            ./dist/hysteria-tun-windows-6.0-386.exe
+            ./dist/hysteria-linux-amd64
+            ./dist/hysteria-linux-386
+            ./dist/hysteria-linux-arm-5
+            ./dist/hysteria-linux-arm-7
+            ./dist/hysteria-linux-arm64
+            ./dist/hysteria-linux-mipsle
+            ./dist/hysteria-darwin-10.12-amd64
+            ./dist/hysteria-darwin-10.12-arm64
+            ./dist/hysteria-windows-6.0-amd64.exe
+            ./dist/hysteria-windows-6.0-386.exe
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4065aff..b70ed87 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,7 +32,7 @@ jobs:
           TIME: "${{ steps.current-time.outputs.time }}"
           CGO_ENABLED: "0"
         with:
-          name: hysteria
+          name: hysteria-notun
           dest: ./dist/
           ldflags: -w -s -X main.appVersion=${{ env.GIT_TAG_NAME }} -X main.appCommit=${{ github.sha }} -X main.appDate=${{ env.TIME }}
           platforms: 'linux/amd64, linux/386, linux/arm, linux/arm64, linux/mipsle, darwin/amd64, darwin/arm64, windows/amd64, windows/386'
@@ -46,8 +46,8 @@ jobs:
           gzip: false
           allow_override: true
           files: >
-            ./dist/hysteria-linux-amd64
-            ./dist/hysteria-linux-386
-            ./dist/hysteria-linux-arm
-            ./dist/hysteria-linux-arm64
-            ./dist/hysteria-linux-mipsle
+            ./dist/hysteria-notun-linux-amd64
+            ./dist/hysteria-notun-linux-386
+            ./dist/hysteria-notun-linux-arm
+            ./dist/hysteria-notun-linux-arm64
+            ./dist/hysteria-notun-linux-mipsle
diff --git a/README.md b/README.md
index 93486b4..ade6ef7 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,9 @@ currently has the following features: (still growing!)
 ### Windows, Linux, macOS CLI
 
 - Download pre-built binaries from https://github.com/tobyxdd/hysteria/releases
+  - Linux builds are available as `hysteria` (with tun support) and `hysteria-notun` (without tun support). Builds 
+    without tun support are statically linked and do not depend on glibc. If you use a non-standard distribution that 
+    can't run `hysteria` properly, try `hysteria-notun` instead.
 - Pull the image from Docker Hub: https://hub.docker.com/r/tobyxdd/hysteria
 - Use our Arch Linux AUR: https://aur.archlinux.org/packages/hysteria/
 - Build from source with `go build ./cmd`
diff --git a/README.zh.md b/README.zh.md
index a855522..0a42c77 100644
--- a/README.zh.md
+++ b/README.zh.md
@@ -28,6 +28,8 @@ Hysteria 是一个功能丰富的，专为恶劣网络环境进行优化的网
 ### Windows, Linux, macOS CLI
 
 - 从 https://github.com/tobyxdd/hysteria/releases 下载编译好的版本
+  - Linux 分为 `hysteria` (带有 tun 支持) 和 `hysteria-notun` (无 tun 支持) 两个版本。无 tun 支持的版本是静态链接，不依赖系统
+    glibc 的。如果你使用了非标准 Linux 发行版，无法正常执行 `hysteria`，可尝试 `hysteria-notun`
 - Docker 镜像: https://hub.docker.com/r/tobyxdd/hysteria
 - 使用 Arch Linux AUR: https://aur.archlinux.org/packages/hysteria/
 - 自己用 `go build ./cmd` 从源码编译