diff --git a/cmd/eris-db.go b/cmd/eris-db.go index e68ed0b6024393126a7ad0a6ffb69d2319e0163e..818ab4c15c8fea753eeaf2dd960a23f296f2fd48 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 2cf48ace139703d4474595b941868a1b9b7d121f..4d37dac57b6b08a376af11b3f38663d3f6118abd 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