From 568b4335c20effb46168bd639317a3420f563463 Mon Sep 17 00:00:00 2001 From: Lorenz Cuno Klopfenstein Date: Tue, 22 May 2018 17:15:19 +0200 Subject: [PATCH] commands: Avoid ANSI character output on Windows Fixes #4462 --- commands/helpers.go | 7 ------- commands/helpers_others.go | 23 +++++++++++++++++++++++ commands/helpers_windows.go | 23 +++++++++++++++++++++++ 3 files changed, 46 insertions(+), 7 deletions(-) create mode 100644 commands/helpers_others.go create mode 100644 commands/helpers_windows.go diff --git a/commands/helpers.go b/commands/helpers.go index 1386e425f..be6edaf99 100644 --- a/commands/helpers.go +++ b/commands/helpers.go @@ -23,13 +23,6 @@ import ( "github.com/spf13/cobra" ) -const ( - ansiEsc = "\u001B" - clearLine = "\r\033[K" - hideCursor = ansiEsc + "[?25l" - showCursor = ansiEsc + "[?25h" -) - type flagsToConfigHandler interface { flagsToConfig(cfg config.Provider) } diff --git a/commands/helpers_others.go b/commands/helpers_others.go new file mode 100644 index 000000000..b6a97e2bd --- /dev/null +++ b/commands/helpers_others.go @@ -0,0 +1,23 @@ +// 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. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// +build !windows + +package commands + +const ( + ansiEsc = "\u001B" + clearLine = "\r\033[K" + hideCursor = ansiEsc + "[?25l" + showCursor = ansiEsc + "[?25h" +) diff --git a/commands/helpers_windows.go b/commands/helpers_windows.go new file mode 100644 index 000000000..fd02c3a03 --- /dev/null +++ b/commands/helpers_windows.go @@ -0,0 +1,23 @@ +// 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. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// +build windows + +package commands + +const ( + ansiEsc = "" + clearLine = "" + hideCursor = "" + showCursor = "" +)