chiu
/
filebrowser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

update Hugo calls

This commit is contained in:
Henrique Dias 2016-02-20 22:33:10 +00:00
parent e8874fabf1
commit 454c59e8a3
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browse/post.go
View File

@ -62,7 +62,7 @@ func POST(w http.ResponseWriter, r *http.Request, c *config.Config) (int, error)
args = append(args, "--kind", archetype) args = append(args, "--kind", archetype)
} }
if err := utils.RunCommand("hugo", args, c.Path); err != nil { if err := utils.RunCommand(c.Hugo, args, c.Path); err != nil {
return http.StatusInternalServerError, err return http.StatusInternalServerError, err
} }
} else { } else {

5
config/config.go
View File

@ -1,10 +1,10 @@
package config package config
import ( import (
"fmt"
"log" "log"
"os" "os"
"os/user" "os/user"
"path/filepath"
"runtime" "runtime"
"strings" "strings"
@ -40,8 +40,9 @@ func ParseHugo(c *setup.Controller) (*Config, error) {
conf.Hugo += ".exe" conf.Hugo += ".exe"
} }
conf.Hugo = filepath.Clean(conf.Hugo)
if _, err := os.Stat(conf.Hugo); os.IsNotExist(err) { if _, err := os.Stat(conf.Hugo); os.IsNotExist(err) {
fmt.Print("hey")
insthugo.Install() insthugo.Install()
} }

2
hugo.go
View File

@ -45,7 +45,7 @@ func Setup(c *setup.Controller) (middleware.Middleware, error) {
} }
if create { if create {
err := utils.RunCommand("hugo", []string{"new", "site", config.Path, "--force"}, ".") err := utils.RunCommand(config.Hugo, []string{"new", "site", config.Path, "--force"}, ".")
if err != nil { if err != nil {
log.Panic(err) log.Panic(err)
} }

2
utils/utils.go
View File

@ -178,7 +178,7 @@ func Run(c *config.Config, force bool) {
} }
} }
if err := RunCommand("hugo", c.Args, c.Path); err != nil { if err := RunCommand(c.Hugo, c.Args, c.Path); err != nil {
log.Panic(err) log.Panic(err)
} }
} }