From 1d624fd1ff6553b0a7eb5af6a395fa54b80f10ad Mon Sep 17 00:00:00 2001 From: lwch Date: Mon, 8 Nov 2021 12:20:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=86=E5=A4=87=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build | 2 +- build_all | 2 +- contrib/build/build | 2 ++ contrib/build/build_all.go | 3 +-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build b/build index 46614fa..7d3def7 100755 --- a/build +++ b/build @@ -1,6 +1,6 @@ #!/bin/sh -VERSION=0.6.0 +VERSION=0.6.1 docker build -t natpass -f contrib/build/Dockerfile . docker run --rm \ diff --git a/build_all b/build_all index acd5a72..0927ce6 100755 --- a/build_all +++ b/build_all @@ -1,6 +1,6 @@ #!/bin/sh -VERSION=0.6.0 +VERSION=0.6.1 docker build -t natpass -f contrib/build/Dockerfile . docker run --rm \ diff --git a/contrib/build/build b/contrib/build/build index 5e8c289..115f168 100755 --- a/contrib/build/build +++ b/contrib/build/build @@ -2,6 +2,8 @@ cd $(dirname $(realpath $0))/../../ +BUILD_VERSION=${BUILD_VERSION:-0.0.0} + HASH=`git log -n1 --pretty=format:%h` REVERSION=`git log --oneline|wc -l|tr -d ' '` BUILD_TIME=`date +'%Y-%m-%d %H:%M:%S'` diff --git a/contrib/build/build_all.go b/contrib/build/build_all.go index 3c4f3e6..6508b1c 100644 --- a/contrib/build/build_all.go +++ b/contrib/build/build_all.go @@ -192,8 +192,7 @@ func build(t target) { env = append(env, "CGO_ENABLED=1") } args = append(args, - path.Join("code", "client", "main.go"), - path.Join("code", "client", "connect.go")) + path.Join("code", "client", "main.go")) cmd = exec.Command("go", args...) cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr