File tree Expand file tree Collapse file tree 3 files changed +13
-13
lines changed Expand file tree Collapse file tree 3 files changed +13
-13
lines changed Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ import (
10
10
"github.com/urfave/cli/v2"
11
11
)
12
12
13
- var Version string = "v1.3.5 "
13
+ var Version string = "v1.3.6 "
14
14
15
15
func init () {
16
16
log .SetOutput (os .Stdout )
Original file line number Diff line number Diff line change 4
4
"bufio"
5
5
"bytes"
6
6
"encoding/json"
7
+ "fmt"
7
8
"os"
8
9
"os/exec"
9
10
"strings"
@@ -96,30 +97,30 @@ func MakeWrap(args []string) {
96
97
// cmd.Stderr = os.Stderr
97
98
stdout , err := cmd .StdoutPipe ()
98
99
if err != nil {
99
- log . Error ( " Error:" , err )
100
- return
100
+ fmt . Println ( "stdout Error:" , err )
101
+ goto out
101
102
}
102
103
stderr , err := cmd .StderrPipe ()
103
104
if err != nil {
104
- log . Error ( " Error:" , err )
105
- return
105
+ fmt . Println ( "stderr Error:" , err )
106
+ goto out
106
107
}
107
108
108
109
if err := cmd .Start (); err != nil {
109
- if exitError , ok := err .(* exec.ExitError ); ok {
110
- StatusCode = exitError .ExitCode ()
111
- log .Errorf ("make failed! errorCode: %d" , StatusCode )
112
- }
110
+ fmt .Println ("start Error:" , err )
111
+ goto out
113
112
}
114
113
115
114
go TransferPrintScanner (stdout )
116
115
go TransferPrintScanner (stderr )
117
116
118
117
if err := cmd .Wait (); err != nil {
119
- log .Error ("Error:" , err )
118
+ StatusCode = cmd .ProcessState .ExitCode ()
119
+ fmt .Printf ("make failed! errorCode: %d\n " , StatusCode )
120
120
}
121
121
}
122
122
123
+ out:
123
124
wg .Wait ()
124
125
}
125
126
Original file line number Diff line number Diff line change 8
8
"os/exec"
9
9
"strings"
10
10
11
- log "github.com/sirupsen/logrus"
12
11
"golang.org/x/text/encoding/simplifiedchinese"
13
12
)
14
13
@@ -56,13 +55,13 @@ func TransferPrintScanner(in io.ReadCloser) {
56
55
for scanner .Scan () {
57
56
result , err := decoder .String (scanner .Text ())
58
57
if err != nil {
59
- log . Error ("decode failed!" , scanner .Text ())
58
+ fmt . Println ("decode failed!" , scanner .Text ())
60
59
result = ""
61
60
}
62
61
fmt .Println (result )
63
62
}
64
63
65
64
if err := scanner .Err (); err != nil {
66
- log . Error ("Error reading scanner:" , err )
65
+ fmt . Println ("Error reading scanner:" , err )
67
66
}
68
67
}
You can’t perform that action at this time.
0 commit comments