33
44package bootstrap
55
6+ // Note: In this file we need to use fmt.Print for the line reset.
7+ // Line resets don't work with log.Print as expected.
68import (
79 "fmt"
8- "log"
910)
1011
1112const (
@@ -37,15 +38,15 @@ func (b *StepLogger) Step(name string, fn func() error) error {
3738 b .subSteps = 0
3839 b .currentStep = name
3940
40- log .Printf ("%s%s%s..." , LINE_RESET , RESET_TEXT , name )
41+ fmt .Printf ("%s%s%s..." , LINE_RESET , RESET_TEXT , name )
4142 err := fn ()
4243 if err != nil {
43- log .Printf ("%s%s%s failed: %v%s\n " , LINE_RESET , RED_TEXT , name , err , RESET_TEXT )
44+ fmt .Printf ("%s%s%s failed: %v%s\n " , LINE_RESET , RED_TEXT , name , err , RESET_TEXT )
4445 } else {
4546 for i := 0 ; i < b .subSteps ; i ++ {
46- log .Printf ("%s" , MOVE_UP_CLEAR_LINE )
47+ fmt .Printf ("%s" , MOVE_UP_CLEAR_LINE )
4748 }
48- log .Printf ("%s%s%s %s✓%s\n " , LINE_RESET , RESET_TEXT , name , GREEN_TEXT , RESET_TEXT )
49+ fmt .Printf ("%s%s%s %s✓%s\n " , LINE_RESET , RESET_TEXT , name , GREEN_TEXT , RESET_TEXT )
4950 }
5051 return err
5152}
@@ -58,22 +59,22 @@ func (b *StepLogger) Substep(name string, fn func() error) error {
5859 b .subSteps += 1
5960 b .currentStep = name
6061
61- log .Printf ("%s%s %s..." , LINE_RESET , RESET_TEXT , name )
62+ fmt .Printf ("%s%s %s..." , LINE_RESET , RESET_TEXT , name )
6263 err := fn ()
6364 if err != nil {
64- log .Printf ("%s%s %s failed: %v%s\n " , LINE_RESET , RED_TEXT , name , err , RESET_TEXT )
65+ fmt .Printf ("%s%s %s failed: %v%s\n " , LINE_RESET , RED_TEXT , name , err , RESET_TEXT )
6566 } else {
66- log .Printf ("%s%s %s %s✓%s\n " , LINE_RESET , RESET_TEXT , name , GREEN_TEXT , RESET_TEXT )
67+ fmt .Printf ("%s%s %s %s✓%s\n " , LINE_RESET , RESET_TEXT , name , GREEN_TEXT , RESET_TEXT )
6768 }
6869 return err
6970}
7071
7172// LogRetry prints a retry message for the current step.
7273func (b * StepLogger ) LogRetry () {
7374 if b .subSteps > 0 {
74- log .Printf ("%s%s Retrying: %s...%s" , LINE_RESET , RESET_TEXT , b .currentStep , RESET_TEXT )
75+ fmt .Printf ("%s%s Retrying: %s...%s" , LINE_RESET , RESET_TEXT , b .currentStep , RESET_TEXT )
7576 } else {
76- log .Printf ("%s%sRetrying: %s...%s" , LINE_RESET , RESET_TEXT , b .currentStep , RESET_TEXT )
77+ fmt .Printf ("%s%sRetrying: %s...%s" , LINE_RESET , RESET_TEXT , b .currentStep , RESET_TEXT )
7778 }
7879}
7980
@@ -84,5 +85,5 @@ func (b *StepLogger) Logf(message string, args ...interface{}) {
8485 }
8586
8687 b .subSteps += 1
87- log .Printf ("%s%s %s%s\n " , LINE_RESET , RESET_TEXT , fmt .Sprintf (message , args ... ), RESET_TEXT )
88+ fmt .Printf ("%s%s %s%s\n " , LINE_RESET , RESET_TEXT , fmt .Sprintf (message , args ... ), RESET_TEXT )
8889}
0 commit comments