Merge pull request #16 from tendermint/develop

Develop

Author: ebuchman

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.2.2 (June 5, 2017)
+
+BUG FIXES:
+- Actually start the Merkleeyes server
+
 ## 0.2.1 (June 2, 2017)
 
 IMPROVEMENTS:

Makefile

@@ -10,7 +10,7 @@ install:
 	go install github.com/tendermint/merkleeyes/cmd/...
 
 dist:
-	@ sudo bash scripts/dist.sh
+	@ bash scripts/dist.sh
 	@ bash scripts/publish.sh
 
 test:

cmd/app.go

@@ -33,6 +33,10 @@ func StartServer(cmd *cobra.Command, args []string) {
 	app := application.NewMerkleEyesApp(dbName, cache)
 	server, err := server.NewServer(address, abci, app)
 
+	if err != nil {
+		cmn.Exit(err.Error())
+	}
+	_, err = server.Start()
 	if err != nil {
 		cmn.Exit(err.Error())
 	}

scripts/dist.sh

@@ -21,12 +21,11 @@ DIR="$( cd -P "$( dirname "$SOURCE" )/.." && pwd )"
 # Change into that dir because we expect that.
 cd "$DIR"
 
-# Generate the tag.
-if [ -z "$NOTAG" ]; then
-  echo "==> Tagging..."
-  git commit --allow-empty -a -m "Release v$VERSION"
-  git tag -a -m "Version $VERSION" "v${VERSION}" master
-fi
+
+# Delete the old dir
+echo "==> Removing old directory..."
+rm -rf build/pkg
+mkdir -p build/pkg
 
 # Do a hermetic build inside a Docker container.
 docker build -t tendermint/${REPO_NAME}-builder scripts/${REPO_NAME}-builder/

scripts/dist_build.sh

@@ -18,11 +18,6 @@ GIT_IMPORT="github.com/tendermint/merkleeyes/version"
 XC_ARCH=${XC_ARCH:-"386 amd64 arm"}
 XC_OS=${XC_OS:-"solaris darwin freebsd linux windows"}
 
-# Delete the old dir
-echo "==> Removing old directory..."
-rm -rf build/pkg
-mkdir -p build/pkg
-
 # Make sure build tools are available.
 make tools
 

version/version.go

@@ -2,6 +2,6 @@ package version
 
 const Maj = "0"
 const Min = "2"
-const Fix = "1"
+const Fix = "2"
 
-const Version = "0.2.1"
+const Version = "0.2.2"