X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=status.go;h=0852dbd03c7579420af105f386349b17656c52ce;hb=2b3f40572950d717efa76f23fb5108af56904907;hp=994e431d57739f1848c386b92003338cea2f0e98;hpb=465fef553f227a11b354182f588d9f6aa7fbbe09;p=goredo.git diff --git a/status.go b/status.go index 994e431..0852dbd 100644 --- a/status.go +++ b/status.go @@ -1,6 +1,6 @@ /* -goredo -- redo implementation on pure Go -Copyright (C) 2020 Sergey Matveev +goredo -- djb's redo implementation on pure Go +Copyright (C) 2020-2021 Sergey Matveev This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,6 +20,7 @@ package main import ( "flag" "fmt" + "log" "os" ) @@ -40,7 +41,7 @@ var ( ) func statusInit() { - if *flagNoStatus { + if NoProgress || *flagNoStatus { return } if v := os.Getenv(EnvNoStatus); v == "1" { @@ -57,7 +58,7 @@ func statusInit() { var err error r, FdStatus, err = os.Pipe() if err != nil { - panic(err) + log.Fatalln(err) } go func() { running := 0 @@ -95,8 +96,9 @@ func statusInit() { CJS, done, CReset, ) } + out = erasedStatus(out, "\r") LogMutex.Lock() - os.Stderr.WriteString(fillUpToTermSize(out, "\r")) + os.Stderr.WriteString(out) LogMutex.Unlock() } }()