Merge pull request #41 from wickyyang/develop

fix rtool's version
dappledger · Oct 15, 2019 · a32f5a1 · a32f5a1
2 parents f1af6af + a5bbde4
commit a32f5a1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/build.sh b/build.sh
@@ -30,15 +30,11 @@ run()
         genesis )
             build $prev"/cmd/genesis" "genesis"
             ;;
-        api )
-            build $prev"/cmd/api" "genesis-api" 
-            ;;
         gtool )
             build $prev"/cmd/client" "gtool"
             ;;
         * )
             build $prev"/cmd/genesis" "genesis"
-            build $prev"/cmd/api" "genesis-api" 
             build $prev"/cmd/client" "gtool"
             ;;
     esac

diff --git a/cmd/client/commands/version.go b/cmd/client/commands/version.go
@@ -17,10 +17,11 @@ import (
 	"fmt"
 
 	"gopkg.in/urfave/cli.v1"
+
+	"github.com/dappledger/AnnChain/chain/types"
 )
 
 var (
-	VERSION         string
 	VersionCommands = cli.Command{
 		Name:   "version",
 		Action: ShowVersion,
@@ -36,5 +37,5 @@ var (
 )
 
 func ShowVersion(ctx *cli.Context) {
-	fmt.Println("version:", VERSION)
+	fmt.Println("version:", types.GetVersion())
 }
diff --git a/cmd/client/main.go b/cmd/client/main.go
@@ -18,6 +18,7 @@ import (
 
 	"gopkg.in/urfave/cli.v1"
 
+	"github.com/dappledger/AnnChain/chain/types"
 	"github.com/dappledger/AnnChain/cmd/client/commands"
 	"github.com/dappledger/AnnChain/cmd/client/commons"
 )
@@ -27,7 +28,7 @@ func main() {
 
 	app := cli.NewApp()
 	app.Name = "anntool"
-	app.Version = "0.6"
+	app.Version = types.GetVersion()
 
 	app.Commands = []cli.Command{
 		commands.SignCommand,