Skip to content

Commit 9e20b54

Browse files
rsdoielrsdoiel
committed
feat: simplfied cmd/string/string.go, dropped cli package requirement
1 parent 084a055 commit 9e20b54

File tree

29 files changed

+79
-240
lines changed

29 files changed

+79
-240
lines changed

‎cmd/csv2json/csv2json.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,15 +178,15 @@ func main() {
178178
out := os.Stdout
179179
eout := os.Stderr
180180

181-
if inputFName != "" {
181+
if inputFName != "" && inputFName != "-" {
182182
in, err = os.Open(inputFName)
183183
if err != nil {
184184
fmt.Fprintln(eout, err)
185185
os.Exit(1)
186186
}
187187
defer in.Close()
188188
}
189-
if outputFName != "" {
189+
if outputFName != "" && outputFName != "-" {
190190
out, err = os.Create(outputFName)
191191
if err != nil {
192192
fmt.Fprintln(eout, err)

‎cmd/csv2mdtable/csv2mdtable.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,15 +157,15 @@ func main() {
157157
out := os.Stdout
158158
eout := os.Stderr
159159

160-
if inputFName != "" {
160+
if inputFName != "" && inputFName != "-" {
161161
in, err = os.Open(inputFName)
162162
if err != nil {
163163
fmt.Fprintln(eout, err)
164164
os.Exit(1)
165165
}
166166
defer in.Close()
167167
}
168-
if outputFName != "" {
168+
if outputFName != "" && outputFName != "-" {
169169
out, err = os.Create(outputFName)
170170
if err != nil {
171171
fmt.Fprintln(eout, err)

‎cmd/csv2xlsx/csv2xlsx.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ func main() {
214214
out := os.Stdout
215215
eout := os.Stderr
216216

217-
if inputFName != "" {
217+
if inputFName != "" && inputFName != "-" {
218218
in, err = os.Open(inputFName)
219219
if err != nil {
220220
fmt.Fprintln(eout, err)
@@ -223,7 +223,7 @@ func main() {
223223
defer in.Close()
224224
}
225225

226-
if outputFName != "" {
226+
if outputFName != "" && outputFName != "-" {
227227
out, err = os.Create(outputFName)
228228
if err != nil {
229229
fmt.Fprintln(eout, err)

‎cmd/csvcleaner/csvcleaner.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ func main() {
224224
out := os.Stdout
225225
eout := os.Stderr
226226

227-
if inputFName != "" {
227+
if inputFName != "" && inputFName != "-" {
228228
in, err = os.Open(inputFName)
229229
if err != nil {
230230
fmt.Fprintln(eout, err)
@@ -233,7 +233,7 @@ func main() {
233233
defer in.Close()
234234
}
235235

236-
if outputFName != "" {
236+
if outputFName != "" && outputFName != "-" {
237237
out, err = os.Create(outputFName)
238238
if err != nil {
239239
fmt.Fprintln(eout, err)

‎cmd/csvcols/csvcols.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ func main() {
258258
out := os.Stdout
259259
eout := os.Stderr
260260

261-
if inputFName != "" {
261+
if inputFName != "" && inputFName != "-" {
262262
in, err = os.Open(inputFName)
263263
if err != nil {
264264
fmt.Fprintln(eout, err)
@@ -267,7 +267,7 @@ func main() {
267267
defer in.Close()
268268
}
269269

270-
if outputFName != "" {
270+
if outputFName != "" && outputFName != "-" {
271271
out, err = os.Create(outputFName)
272272
if err != nil {
273273
fmt.Fprintln(eout, err)

‎cmd/csvfind/csvfind.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ func main() {
238238
out := os.Stdout
239239
eout := os.Stderr
240240

241-
if inputFName != "" {
241+
if inputFName != "" && inputFName != "-" {
242242
in, err = os.Open(inputFName)
243243
if err != nil {
244244
fmt.Fprintln(eout, err)
@@ -248,7 +248,7 @@ func main() {
248248

249249
}
250250

251-
if outputFName != "" {
251+
if outputFName != "" && outputFName != "-" {
252252
out, err = os.Create(outputFName)
253253
if err != nil {
254254
fmt.Fprintln(eout, err)

‎cmd/csvjoin/csvjoin.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,8 @@ func main() {
295295
eout := os.Stderr
296296

297297

298-
if outputFName != "" {
299-
out, err := os.Create(outputFName)
298+
if outputFName != "" && outputFName != "-" {
299+
out, err = os.Create(outputFName)
300300
if err != nil {
301301
fmt.Fprintln(eout, err)
302302
os.Exit(1)

‎cmd/csvrows/csvrows.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ func main() {
205205
out := os.Stdout
206206
eout := os.Stderr
207207

208-
if inputFName != "" {
208+
if inputFName != "" && inputFName != "-" {
209209
in, err = os.Open(inputFName)
210210
if err != nil {
211211
fmt.Fprintln(eout, err)
@@ -214,7 +214,7 @@ func main() {
214214
defer in.Close()
215215
}
216216

217-
if outputFName != "" {
217+
if outputFName != "" && outputFName != "-" {
218218
out, err = os.Create(outputFName)
219219
if err != nil {
220220
fmt.Fprintln(eout, err)

‎cmd/finddir/finddir.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ func main() {
228228
out := os.Stdout
229229
eout := os.Stderr
230230

231-
if outputFName != "" {
231+
if outputFName != "" && outputFName != "-" {
232232
out, err = os.Create(outputFName)
233233
if err != nil {
234234
fmt.Fprintln(eout, err)

‎cmd/findfile/findfile.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ func main() {
227227
out := os.Stdout
228228
eout := os.Stderr
229229

230-
if outputFName != "" {
230+
if outputFName != "" && outputFName != "-" {
231231
out, err = os.Create(outputFName)
232232
if err != nil {
233233
fmt.Fprintln(eout, err)

0 commit comments

Comments
 (0)