lbsadmin/bee
1
0
Fork 0
mirror of https://github.com/beego/bee.git synced 2024-11-22 05:00:54 +00:00
Code Issues Releases Activity

Fixed merge conflict

Browse Source
This commit is contained in:
Faissal Elamraoui 2016-07-28 14:19:42 +02:00
parent 8eb3d9d392
commit 24955fb044
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -6,6 +6,7 @@
# Folders # Folders
_obj _obj
_test _test
.idea
# Architecture specific extensions/prefixes # Architecture specific extensions/prefixes
*.[568vq] *.[568vq]

37
run.go
View File

@ -20,6 +20,7 @@ import (
path "path/filepath" path "path/filepath"
"runtime" "runtime"
"strings" "strings"
"fmt"
) )
var cmdRun = &Command{ var cmdRun = &Command{
@ -32,18 +33,23 @@ it will recompile and restart the app after any modifications.
`, `,
} }
var mainFiles ListOpts var (
mainFiles ListOpts
var downdoc docValue downdoc docValue
var gendoc docValue gendoc docValue
// The flags list of the paths excluded from watching
// The flags list of the paths excluded from watching excludedPaths strFlags
var excludedPaths strFlags // Pass through to -tags arg of "go build"
buildTags string
// Pass through to -tags arg of "go build" // Application path
var buildTags string currpath string
// Application name
var vendorWatch bool appname string
// Channel to signal an Exit
exit chan bool
// Flag to watch the vendor folder
vendorWatch bool
)
func init() { func init() {
cmdRun.Run = runApp cmdRun.Run = runApp
@ -53,14 +59,9 @@ func init() {
cmdRun.Flag.Var(&excludedPaths, "e", "Excluded paths[].") cmdRun.Flag.Var(&excludedPaths, "e", "Excluded paths[].")
cmdRun.Flag.BoolVar(&vendorWatch, "vendor", false, "Watch vendor folder") cmdRun.Flag.BoolVar(&vendorWatch, "vendor", false, "Watch vendor folder")
cmdRun.Flag.StringVar(&buildTags, "tags", "", "Build tags (https://golang.org/pkg/go/build/)") cmdRun.Flag.StringVar(&buildTags, "tags", "", "Build tags (https://golang.org/pkg/go/build/)")
exit = make(chan bool)
} }
var (
currpath = ""
appname = ""
exit = make(chan bool)
)
func runApp(cmd *Command, args []string) int { func runApp(cmd *Command, args []string) int {
ShowShortVersionBanner() ShowShortVersionBanner()