a/realize
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

name value fixed

Browse Source
This commit is contained in:
alessio 2016-08-22 00:56:07 +02:00
parent c5d61e2afd
commit 562ced11ab
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
realize/config.go
View File

@ -6,9 +6,9 @@ import (
"gopkg.in/urfave/cli.v2" "gopkg.in/urfave/cli.v2"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
"io/ioutil" "io/ioutil"
"log"
"os" "os"
"strings" "strings"
"log"
) )
// Config struct contains the general informations about a project // Config struct contains the general informations about a project
@ -21,7 +21,7 @@ type Config struct {
// NameParam check the project name presence. If empty takes the working directory name // NameParam check the project name presence. If empty takes the working directory name
func nameParam(params *cli.Context) string { func nameParam(params *cli.Context) string {
var name string var name string
if params.String("name") == "" && params.String("path") == ""{ if params.String("name") == "" && params.String("path") == "" {
dir, err := os.Getwd() dir, err := os.Getwd()
if err != nil { if err != nil {
log.Fatal(Red(err)) log.Fatal(Red(err))
@ -29,7 +29,8 @@ func nameParam(params *cli.Context) string {
wd := strings.Split(dir, "/") wd := strings.Split(dir, "/")
return wd[len(wd)-1] return wd[len(wd)-1]
} else if params.String("path") != "/" { } else if params.String("path") != "/" {
name = params.String("path") name = slash(params.String("path"))
name = name[1:]
} else { } else {
name = params.String("name") name = params.String("name")
} }
@ -52,7 +53,7 @@ func New(params *cli.Context) *Config {
Projects: []Project{ Projects: []Project{
{ {
Name: nameParam(params), Name: nameParam(params),
Path: params.String("path"), Path: slash(params.String("path")),
Build: params.Bool("build"), Build: params.Bool("build"),
Bin: boolParam(params.Bool("bin")), Bin: boolParam(params.Bool("bin")),
Run: boolParam(params.Bool("run")), Run: boolParam(params.Bool("run")),
@ -123,7 +124,7 @@ func (h *Config) Add(params *cli.Context) error {
if err == nil { if err == nil {
new := Project{ new := Project{
Name: nameParam(params), Name: nameParam(params),
Path: params.String("path"), Path: slash(params.String("path")),
Build: params.Bool("build"), Build: params.Bool("build"),
Bin: boolParam(params.Bool("bin")), Bin: boolParam(params.Bool("bin")),
Run: boolParam(params.Bool("run")), Run: boolParam(params.Bool("run")),