From 9ecdb7acb55a3e1b56214a4bb4084ed67cf4a24c Mon Sep 17 00:00:00 2001
From: Benjamin Bollen <ben@erisindustries.com>
Date: Mon, 11 Jul 2016 11:23:37 +0200
Subject: [PATCH] cmd/eris-db: minor cleanup
---
cmd/eris-db.go | 10 +---------
cmd/eris-db/main.go | 41 ++---------------------------------------
2 files changed, 3 insertions(+), 48 deletions(-)
diff --git a/cmd/eris-db.go b/cmd/eris-db.go
index e68ed0b6..818ab4c1 100644
--- a/cmd/eris-db.go
+++ b/cmd/eris-db.go
@@ -29,8 +29,6 @@ import (
version "github.com/eris-ltd/eris-db/version"
)
-const VERSION = version.VERSION
-
// Global Do struct
var do *definitions.Do
@@ -44,7 +42,7 @@ your needs.
Made with <3 by Eris Industries.
Complete documentation is available at https://docs.erisindustries.com
-` + "\nVERSION:\n " + VERSION,
+` + "\nVERSION:\n " + version.VERSION,
PersistentPreRun: func(cmd *cobra.Command, args []string) {
log.SetLevel(log.WarnLevel)
@@ -94,12 +92,6 @@ func defaultDebug() bool {
return setDefaultBool("ERIS_DB_DEBUG", false)
}
-// defaultOutput is set to true unless the ERIS_DB_OUTPUT environment
-// variable is set to a parsable boolean.
-func defaultOutput() bool {
- return setDefaultBool("ERIS_DB_OUTPUT", true)
-}
-
// setDefaultBool returns the provided default value if the environment variab;e
// is not set or not parsable as a bool.
func setDefaultBool(environmentVariable string, defaultValue bool) bool {
diff --git a/cmd/eris-db/main.go b/cmd/eris-db/main.go
index 2cf48ace..4d37dac5 100644
--- a/cmd/eris-db/main.go
+++ b/cmd/eris-db/main.go
@@ -17,46 +17,9 @@
package main
import (
- "github.com/eris-ltd/eris-db/cmd"
+ commands "github.com/eris-ltd/eris-db/cmd"
)
func main() {
commands.Execute()
-}
-
-// package main
-//
-// import (
-// "fmt"
-// edb "github.com/eris-ltd/eris-db/erisdb"
-// "os"
-// )
-//
-// // TODO the input stuff.
-// func main() {
-// args := os.Args[1:]
-// var baseDir string
-// var inProc bool
-// if len(args) > 0 {
-// baseDir = args[0]
-// if len(args) > 1 {
-// if args[1] == "inproc" {
-// inProc = true
-// }
-// }
-// } else {
-// baseDir = os.Getenv("HOME") + "/.erisdb"
-// }
-//
-// proc, errSt := edb.ServeErisDB(baseDir, inProc)
-// if errSt != nil {
-// panic(errSt.Error())
-// }
-// errSe := proc.Start()
-// if errSe != nil {
-// panic(errSe.Error())
-// }
-// // TODO For now.
-// fmt.Println("DONTMINDME55891")
-// <-proc.StopEventChannel()
-// }
+}
\ No newline at end of file
--
GitLab