llvy.ltd/bee
1
0
Fork 0
mirror of https://github.com/casbin/bee.git synced 2025-07-17 04:03:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
Faissal Elamraoui
2016-11-22 10:33:11 +01:00
parent 215ef4485a 03f2057eb0
commit 5defe7c368
15 changed files with 113 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pack.go
View File

@ -101,6 +101,7 @@ func init() {
fs.BoolVar(&verbose, "v", false, "verbose")
cmdPack.Flag = *fs
cmdPack.Run = packApp
cmdPack.PreRun = func(cmd *Command, args []string) { ShowShortVersionBanner() }
w = NewColorWriter(os.Stdout)
}
@ -449,8 +450,6 @@ func packDirectory(excludePrefix []string, excludeSuffix []string,
}
func packApp(cmd *Command, args []string) int {
ShowShortVersionBanner()
curPath, _ := os.Getwd()
thePath := ""
@ -593,11 +592,13 @@ func packApp(cmd *Command, args []string) int {
}
}
logger.Infof("Writing to output: %s", outputP)
err = packDirectory(exp, exs, exr, tmpdir, thePath)
if err != nil {
logger.Fatal(err.Error())
}
logger.Infof("Writing to output: %s", outputP)
logger.Success("Application packed!")
return 0
}