Commit fcab7e06 authored by mdj33's avatar mdj33 Committed by vipwzw

fix linter

parent b3a67a40
...@@ -10,8 +10,9 @@ SRC_CLI := github.com/33cn/plugin/cli ...@@ -10,8 +10,9 @@ SRC_CLI := github.com/33cn/plugin/cli
APP := build/chain33 APP := build/chain33
CHAIN33=github.com/33cn/chain33 CHAIN33=github.com/33cn/chain33
CHAIN33_VERSION=$(shell nl go.mod |grep "github.com/33cn/chain33" |awk '{print $$3}') CHAIN33_VERSION=$(shell nl go.mod |grep "github.com/33cn/chain33" |awk '{print $$3}')
export CHAIN33_PATH=${GOPATH}/pkg/mod/github.com/33cn/chain33@${CHAIN33_VERSION} GO_PATH=$(shell go env GOPATH)
export PLUGIN_PATH=${GOPATH}/src/github.com/33cn/plugin export CHAIN33_PATH=${GO_PATH}/pkg/mod/github.com/33cn/chain33@${CHAIN33_VERSION}
export PLUGIN_PATH=${GO_PATH}/src/github.com/33cn/plugin
BUILD_FLAGS = -ldflags "-X ${CHAIN33_PATH}/common/version.GitCommit=`git rev-parse --short=8 HEAD`" BUILD_FLAGS = -ldflags "-X ${CHAIN33_PATH}/common/version.GitCommit=`git rev-parse --short=8 HEAD`"
LDFLAGS := -ldflags "-w -s" LDFLAGS := -ldflags "-w -s"
PKG_LIST_VET := `go list ./... | grep -v "vendor" | grep -v plugin/dapp/evm/executor/vm/common/crypto/bn256` PKG_LIST_VET := `go list ./... | grep -v "vendor" | grep -v plugin/dapp/evm/executor/vm/common/crypto/bn256`
...@@ -27,7 +28,8 @@ default: depends build ...@@ -27,7 +28,8 @@ default: depends build
build: depends build: depends
go build $(BUILD_FLAGS) -v -i -o $(APP) go build $(BUILD_FLAGS) -v -i -o $(APP)
go build $(BUILD_FLAGS) -v -i -o $(CLI) $(SRC_CLI) go build $(BUILD_FLAGS) -v -i -o $(CLI) $(SRC_CLI)
@cp chain33.toml $(CHAIN33_PATH)/build/system-test-rpc.sh build/ @cp chain33.toml build/
cp $(CHAIN33_PATH)/build/system-test-rpc.sh build/
@cp chain33.para.toml build/ci/paracross/ @cp chain33.para.toml build/ci/paracross/
......
...@@ -246,9 +246,9 @@ function block_wait2height() { ...@@ -246,9 +246,9 @@ function block_wait2height() {
while true; do while true; do
new_height=$(${1} block last_header | jq ".height") new_height=$(${1} block last_header | jq ".height")
if [ $isPara == "1" ]; then if [ "$isPara" == "1" ]; then
${1} para blocks -s $new_height -e $new_height ${1} para blocks -s "$new_height" -e "$new_height"
new_height=$(${1} para blocks -s $new_height -e $new_height | jq ".items[0].mainHeight") new_height=$(${1} para blocks -s "$new_height" -e "$new_height" | jq ".items[0].mainHeight")
fi fi
if [ "${new_height}" -ge "${expect}" ]; then if [ "${new_height}" -ge "${expect}" ]; then
break break
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment