fix arm build stripts

p4gefau1t · May 15, 2020 · 2fef3a7 · 2fef3a7
1 parent ae349f8
commit 2fef3a7
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/build-all.sh b/build-all.sh
@@ -40,7 +40,7 @@ for PLATFORM in $PLATFORMS; do
   eval $CMD || FAILURES="${FAILURES} ${PLATFORM}"
   zip -j release/$ZIP_FILENAME temp/* ./*.dat
   zip release/$ZIP_FILENAME example/*
-  sha1sum release/$ZIP_FILENAME > release/$ZIP_FILENAME.sha1
+  sha1sum release/$ZIP_FILENAME >> release/checksum.sha1
   rm temp/*
 done
 
@@ -51,12 +51,12 @@ for GOOS in $PLATFORMS_ARM; do
   GOARCH="arm"
   for GOARM in 7 6 5; do
     ZIP_FILENAME="trojan-go-${GOOS}-${GOARCH}v${GOARM}.zip"
-    CMD="CGO_ENABLE=0 GOARM=${GOARM} GOOS=${GOOS} GOARCH=${GOARCH} go build -o temp -ldflags \"-s -w\""
+    CMD="CGO_ENABLE=0 GOARM=${GOARM} GOOS=${GOOS} GOARCH=${GOARCH} go build -tags \"full\" -o temp -ldflags \"-s -w\""
     echo "${CMD}"
     eval "${CMD}" || FAILURES="${FAILURES} ${GOOS}/${GOARCH}v${GOARM}" 
     zip -j release/$ZIP_FILENAME temp/* ./*.dat
     zip release/$ZIP_FILENAME example/*
-    sha1sum release/$ZIP_FILENAME > release/$ZIP_FILENAME.sha1
+    sha1sum release/$ZIP_FILENAME >> release/checksum.sha1
     rm temp/*
   done
 done

diff --git a/common/common.go b/common/common.go
@@ -11,7 +11,7 @@ import (
 )
 
 const (
-	Version = "v0.4.9"
+	Version = "v0.4.10"
 )
 
 type Runnable interface {

diff --git a/docs/config.toml b/docs/config.toml
@@ -16,7 +16,7 @@ enableMissingTranslationPlaceholders = false
     # Source Code repository section
     description = "An unidentifiable mechanism that helps you bypass GFW. "
     github_repository = "https://github.com/p4gefau1t/trojan-go"
-    version = "0.4.9"
+    version = "0.4.10"
 
     # Documentation repository section
     # documentation repository (set edit link to documentation repository)

diff --git a/docs/content/basic/full-config.md b/docs/content/basic/full-config.md
@@ -285,7 +285,7 @@ trojan-go兼容trojan-gfw的基于mysql的用户管理方式，但更推荐的
 
 其他选项可以顾名思义，不再赘述。
 
-users表结构和trojan-gfw定义一致，下面是一个创建users表的例子。注意这里的password指的是密码经过SHA224哈希之后的值（字符串），流量download, upload, quota的单位是字节。你可以通过修改数据库users表中的用户记录的方式，添加和删除用户，或者指定用户的流量配额。trojan-go会根据所有的用户流量配额，自动更新当前有效的用户列表。如果download+upload>quota，trojan-go服务器将拒绝该用户的连接。
+users表结构和trojan-gfw定义一致，下面是一个创建users表的例子。注意这里的password指的是密码经过SHA224散列之后的值（字符串），流量download, upload, quota的单位是字节。你可以通过修改数据库users表中的用户记录的方式，添加和删除用户，或者指定用户的流量配额。trojan-go会根据所有的用户流量配额，自动更新当前有效的用户列表。如果download+upload>quota，trojan-go服务器将拒绝该用户的连接。
 
 ```mysql
 CREATE TABLE users (

diff --git a/shadow/shadow.go b/shadow/shadow.go
@@ -27,7 +27,7 @@ type ShadowManager struct {
 
 func (m *ShadowManager) SubmitScapegoat(goat *Scapegoat) {
 	m.scapegoatChan <- goat
-	log.Debug("scapegoat commited")
+	log.Debug("scapegoat submited")
 }
 
 func (m *ShadowManager) handleScapegoat() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ import ( @@
     )
     const (
-    	Version = "v0.4.9"
+    	Version = "v0.4.10"
     )
     type Runnable interface {
@@ Expand Down @@