Some more error fixes in commands

See #1502
This commit is contained in:
Bjørn Erik Pedersen 2015-12-02 16:27:08 +01:00
parent 3f0f7eed68
commit c5287e7817

View file

@ -176,7 +176,7 @@ func NewTheme(cmd *cobra.Command, args []string) error {
jww.INFO.Println("creating theme at", createpath) jww.INFO.Println("creating theme at", createpath)
if x, _ := helpers.Exists(createpath, hugofs.SourceFs); x { if x, _ := helpers.Exists(createpath, hugofs.SourceFs); x {
jww.FATAL.Fatalln(createpath, "already exists") return newUserError(createpath, "already exists")
} }
mkdir(createpath, "layouts", "_default") 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) err := helpers.WriteToDisk(filepath.Join(createpath, "archetypes", "default.md"), bytes.NewReader(archDefault), hugofs.SourceFs)
if err != nil { if err != nil {
return err
jww.FATAL.Fatalln(err)
} }
mkdir(createpath, "static", "js") 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) err = helpers.WriteToDisk(filepath.Join(createpath, "LICENSE.md"), bytes.NewReader(by), hugofs.SourceFs)
if err != nil { if err != nil {
return nil return err
} }
createThemeMD(createpath) createThemeMD(createpath)