X-Git-Url: http://www.git.cypherpunks.ru/?p=goredo.git;a=blobdiff_plain;f=status.go;h=d6f7c0d4f9898270ca3df148584415a802b49a8b;hp=d9e7f56a134e9d5e53d967437e35b71c2e9f8e6e;hb=4274dce3366cee45bfaccbe5ca340ce6efe68e00;hpb=edb601644735972fac3efcdc27849b5b9b1f5fb7 diff --git a/status.go b/status.go index d9e7f56..d6f7c0d 100644 --- a/status.go +++ b/status.go @@ -1,5 +1,5 @@ /* -goredo -- redo implementation on pure Go +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 @@ -20,6 +20,7 @@ package main import ( "flag" "fmt" + "log" "os" ) @@ -36,9 +37,17 @@ const ( var ( FdStatus *os.File - flagNoStatus = flag.Bool("no-status", false, "disable statusline (REDO_NO_STATUS=1)") + flagNoStatus *bool ) +func init() { + cmdName := CmdName() + if !(cmdName == CmdNameRedo || cmdName == CmdNameRedoIfchange) { + return + } + flagNoStatus = flag.Bool("no-status", false, "disable statusline (REDO_NO_STATUS=1)") +} + func statusInit() { if NoProgress || *flagNoStatus { return @@ -57,7 +66,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 +104,9 @@ func statusInit() { CJS, done, CReset, ) } + out = erasedStatus(out, "\r") LogMutex.Lock() - os.Stderr.WriteString(fillUpToTermSize(out, "\r")) + os.Stderr.WriteString(out) LogMutex.Unlock() } }()