Merge remote-tracking branch 'origin/bugfix/init-cmd-overwrites-existing-files' into develop

Author: illya13

Makefile

@@ -1,29 +1,28 @@
-.PHONY: get_deps build all list_deps install
-
-all: get_deps install test
-
 TMROOT = $${TMROOT:-$$HOME/.tendermint}
-define NEWLINE
-
+PACKAGES=$(shell go list ./... | grep -v '/vendor/')
 
-endef
-NOVENDOR = go list github.com/tendermint/ethermint/... | grep -v /vendor/
+install: get_vendor_deps
+	@go install ./cmd/ethermint
 
-install: get_deps
-	go install github.com/tendermint/ethermint/cmd/ethermint
+test:
+	@echo "--> Running go test"
+	@go test `${PACKAGES}`
 
-test: build
-	go test `${NOVENDOR}`
-	
-test_race: build
-	go test -race `${NOVENDOR}`
+test_race:
+	@echo "--> Running go test --race"
+	@go test -race `${PACKAGES}`
 
 get_deps:
-	go get -d `${NOVENDOR}`
-	go list -f '{{join .TestImports "\n"}}' github.com/tendermint/ethermint/... | \
+	@go get -d `${PACKAGES}`
+	@go list -f '{{join .TestImports "\n"}}' ./... | \
 		grep -v /vendor/ | sort | uniq | \
 		xargs go get
 
 get_vendor_deps:
 	go get github.com/Masterminds/glide
-	glide install --strip-vendor
+	@echo "--> Running glide install"
+	@glide install --strip-vendor
+
+all: install test
+
+.PHONY: get_deps get_vendor_deps install test test_race

cmd/ethermint/init.go

@@ -3,23 +3,23 @@ package main
 import (
 	"os"
 
-	. "github.com/tendermint/go-common"
+	cmn "github.com/tendermint/go-common"
 	"github.com/tendermint/tendermint/types"
 )
 
 func init_files() {
 	// if no priv val, make it
 	privValFile := config.GetString("priv_validator_file")
-	if _, err := os.Stat(privValFile); err != nil {
+	if _, err := os.Stat(privValFile); os.IsNotExist(err) {
 		privValidator := types.GenPrivValidator()
 		privValidator.SetFile(privValFile)
 		privValidator.Save()
 
 		// if no genesis, make it using the priv val
 		genFile := config.GetString("genesis_file")
-		if _, err := os.Stat(genFile); err != nil {
+		if _, err := os.Stat(genFile); os.IsNotExist(err) {
 			genDoc := types.GenesisDoc{
-				ChainID: Fmt("test-chain-%v", RandStr(6)),
+				ChainID: cmn.Fmt("test-chain-%v", cmn.RandStr(6)),
 			}
 			genDoc.Validators = []types.GenesisValidator{types.GenesisValidator{
 				PubKey: privValidator.PubKey,