From c5287e78170474abcf8bbb3aa0fd837de2bafaaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Wed, 2 Dec 2015 16:27:08 +0100 Subject: [PATCH] Some more error fixes in commands See #1502 --- commands/new.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/commands/new.go b/commands/new.go index 579d12a5..da2588fb 100644 --- a/commands/new.go +++ b/commands/new.go @@ -176,7 +176,7 @@ func NewTheme(cmd *cobra.Command, args []string) error { jww.INFO.Println("creating theme at", createpath) if x, _ := helpers.Exists(createpath, hugofs.SourceFs); x { - jww.FATAL.Fatalln(createpath, "already exists") + return newUserError(createpath, "already exists") } mkdir(createpath, "layouts", "_default") @@ -196,8 +196,7 @@ func NewTheme(cmd *cobra.Command, args []string) error { err := helpers.WriteToDisk(filepath.Join(createpath, "archetypes", "default.md"), bytes.NewReader(archDefault), hugofs.SourceFs) if err != nil { - - jww.FATAL.Fatalln(err) + return err } mkdir(createpath, "static", "js") @@ -227,7 +226,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. err = helpers.WriteToDisk(filepath.Join(createpath, "LICENSE.md"), bytes.NewReader(by), hugofs.SourceFs) if err != nil { - return nil + return err } createThemeMD(createpath)