diff --git a/initiatory.go b/initiatory.go index a58246f8..26bf1791 100644 --- a/initiatory.go +++ b/initiatory.go @@ -1,7 +1,6 @@ package iris import ( - "flag" "fmt" "os" "sync" @@ -79,14 +78,6 @@ type Framework struct { Websocket websocket.Server } -// SkipBannerFlag, if enabled then means that this instance ran propably by an external software, which can disable the banner output by the command line argument '-s' -var SkipBannerFlag bool - -func init() { - flag.BoolVar(&SkipBannerFlag, "s", false, "Disable banner via command line tool, overrides the logger's config field") // this mostly used by the iris command line tool - flag.Parse() -} - // New creates and returns a new Iris station aka Framework. // // Receives an optional config.Iris as parameter @@ -170,9 +161,7 @@ func (s *Framework) openServer() (err error) { s.HTTPServer.SetHandler(s.mux) if err = s.HTTPServer.Open(); err == nil { // print the banner - if s.Config.DisableBanner || SkipBannerFlag { - // skip the banner - } else { + if !s.Config.DisableBanner { s.Logger.PrintBanner(banner, fmt.Sprintf("%s: Running at %s\n", time.Now().Format(config.TimeFormat), s.HTTPServer.Host())) diff --git a/iris/main.go b/iris/main.go index fd0aca31..d4b2272a 100644 --- a/iris/main.go +++ b/iris/main.go @@ -14,6 +14,7 @@ import ( ) const ( + // Version of Iris command line tool Version = "0.0.8" ) diff --git a/iris/run.go b/iris/run.go index b0109861..2b407607 100644 --- a/iris/run.go +++ b/iris/run.go @@ -23,7 +23,7 @@ var ( goExt = ".go" ) -var times uint32 = 0 +var times uint32 func build(sourcepath string) error { goBuild := utils.CommandBuilder("go", "build", sourcepath) @@ -40,9 +40,7 @@ func build(sourcepath string) error { func run(executablePath string) (*utils.Cmd, error) { runCmd := utils.CommandBuilder("." + utils.PathSeparator + executablePath) - if times >= 1 { - runCmd.AppendArguments("-s") //-s to skip the banner after the first time - } + runCmd.Dir = workingDir runCmd.Stderr = os.Stderr runCmd.Stdout = os.Stdout @@ -121,7 +119,7 @@ func runAndWatch(flags cli.Flags) error { }, printer) - if err := build(programPath); err != nil { + if err = build(programPath); err != nil { printer.Dangerf(err.Error()) return err }