Browse Source

Fixed merge conflict

pull/235/head
Faissal Elamraoui 4 years ago
parent
commit
24955fb044
2 changed files with 20 additions and 18 deletions
  1. + 1
    - 0
      .gitignore
  2. + 19
    - 18
      run.go

+ 1
- 0
.gitignore

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

+ 19
- 18
run.go

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

Loading…
Cancel
Save