summaryrefslogtreecommitdiffstats
path: root/commands/hugo.go
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2018-04-10 08:55:13 +0200
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2018-04-11 09:50:19 +0200
commit018602c46db8d729af2871bd5f4c1e7480420f09 (patch)
tree9e497ea0125930522cb0bf522f9687992ded44f5 /commands/hugo.go
parent2f0d98a19b021d03930003217b0519afaef3a391 (diff)
commands: Extract some common types into its own file
See #4598
Diffstat (limited to 'commands/hugo.go')
-rw-r--r--commands/hugo.go48
1 files changed, 1 insertions, 47 deletions
diff --git a/commands/hugo.go b/commands/hugo.go
index 3c3cf26d3..3f468dd7d 100644
--- a/commands/hugo.go
+++ b/commands/hugo.go
@@ -1,4 +1,4 @@
-// Copyright 2016 The Hugo Authors. All rights reserved.
+// Copyright 2018 The Hugo Authors. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -59,13 +59,6 @@ import (
// provide a cleaner external API, but until then, this is it.
var Hugo *hugolib.HugoSites
-const (
- ansiEsc = "\u001B"
- clearLine = "\r\033[K"
- hideCursor = ansiEsc + "[?25l"
- showCursor = ansiEsc + "[?25h"
-)
-
// Reset resets Hugo ready for a new full build. This is mainly only useful
// for benchmark testing etc. via the CLI commands.
func Reset() error {
@@ -73,45 +66,6 @@ func Reset() error {
return nil
}
-// commandError is an error used to signal different error situations in command handling.
-type commandError struct {
- s string
- userError bool
-}
-
-func (c commandError) Error() string {
- return c.s
-}
-
-func (c commandError) isUserError() bool {
- return c.userError
-}
-
-func newUserError(a ...interface{}) commandError {
- return commandError{s: fmt.Sprintln(a...), userError: true}
-}
-
-func newSystemError(a ...interface{}) commandError {
- return commandError{s: fmt.Sprintln(a...), userError: false}
-}
-
-func newSystemErrorF(format string, a ...interface{}) commandError {
- return commandError{s: fmt.Sprintf(format, a...), userError: false}
-}
-
-// Catch some of the obvious user errors from Cobra.
-// We don't want to show the usage message for every error.
-// The below may be to generic. Time will show.
-var userErrorRegexp = regexp.MustCompile("argument|flag|shorthand")
-
-func isUserError(err error) bool {
- if cErr, ok := err.(commandError); ok && cErr.isUserError() {
- return true
- }
-
- return userErrorRegexp.MatchString(err.Error())
-}
-
// HugoCmd is Hugo's root command.
// Every other command attached to HugoCmd is a child command to it.
var HugoCmd = &cobra.Command{