diff --git a/harness/app.go b/harness/app.go index 60b8613..d3abc26 100644 --- a/harness/app.go +++ b/harness/app.go @@ -135,10 +135,8 @@ func (cmd AppCmd) Kill() { // Send an interrupt signal to allow for a graceful shutdown utils.Logger.Info("Killing revel server pid", "pid", cmd.Process.Pid) var err error - if runtime.GOOS == "windows" { + if runtime.GOOS != "windows" { // os.Interrupt is not available on windows - err = cmd.Process.Signal(os.Kill) - } else { err = cmd.Process.Signal(os.Interrupt) } diff --git a/harness/harness.go b/harness/harness.go index cefc5d6..87ad05b 100644 --- a/harness/harness.go +++ b/harness/harness.go @@ -332,11 +332,11 @@ func (h *Harness) Run() { // Make a new channel to listen for the interrupt event ch := make(chan os.Signal) signal.Notify(ch, os.Interrupt, os.Kill) + <-ch // Kill the app and exit if h.app != nil { h.app.Kill() } - <-ch os.Exit(1) } diff --git a/model/command/version.go b/model/command/version.go index 45dca50..71bfe2b 100644 --- a/model/command/version.go +++ b/model/command/version.go @@ -2,7 +2,5 @@ package command type ( Version struct { ImportCommand - Update bool `short:"u" long:"update" description:"Update the framework and modules" required:"false"` - UpdateVersion string `long:"update-version" description:"Specify the version the revel and app will be switched to" required:"false"` } ) diff --git a/model/command_config.go b/model/command_config.go index 717a061..fc8776a 100644 --- a/model/command_config.go +++ b/model/command_config.go @@ -48,7 +48,7 @@ type ( Vendored bool // True if the application is vendored PackageResolver func(pkgName string) error // a package resolver for the config BuildFlags []string `short:"X" long:"build-flags" description:"These flags will be used when building the application. May be specified multiple times, only applicable for Build, Run, Package, Test commands"` - GoModFlags []string `long:"gomod-flags" description:"These flags will execut go mod commands for each flag, this happens during the build process"` + GoModFlags []string `long:"gomod-flags" description:"These flags will execute go mod commands for each flag, this happens during the build process"` New command.New `command:"new"` Build command.Build `command:"build"` Run command.Run `command:"run"` diff --git a/revel/version.go b/revel/version.go index 5dc6acf..ff70964 100644 --- a/revel/version.go +++ b/revel/version.go @@ -110,16 +110,6 @@ func (v *VersionCommand) doRepoCheck(updateLibs bool) (versionInfo string, needs } // Only do an update on the first loop, and if specified to update - shouldUpdate := updateLibs && v.Command.Version.Update - if v.Command.Version.Update { - if localVersion == nil || (versonFromRepo != nil && versonFromRepo.Newer(localVersion)) { - needsUpdate = true - if shouldUpdate { - v.doUpdate(title, repo, localVersion, versonFromRepo) - v.updateLocalVersions() - } - } - } versionInfo = versionInfo + v.outputVersion(title, repo, localVersion, versonFromRepo) } return @@ -234,6 +224,10 @@ func (v *VersionCommand) updateLocalVersions() { v.cmdVersion.BuildDate = cmd.BuildDate v.cmdVersion.MinGoVersion = cmd.MinimumGoVersion + if v.Command.Version.ImportPath=="" { + return + } + pathMap, err := utils.FindSrcPaths(v.Command.AppPath, []string{model.RevelImportPath, model.RevelModulesImportPath}, v.Command.PackageResolver) if err != nil { utils.Logger.Warn("Unable to extract version information from Revel library", "path", pathMap[model.RevelImportPath], "error", err)