Skip to content

Commit 08091e0

Browse files
rsdoielrsdoiel
committed
normalized command line options
1 parent a487db4 commit 08091e0

File tree

8 files changed

+24
-13
lines changed

8 files changed

+24
-13
lines changed

‎Makefile

+8-8
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ VERSION = $(shell grep -m1 'Version = ' $(PROJECT).go | cut -d\" -f 2)
77

88
BRANCH = $(shell git branch | grep '* ' | cut -d\ -f 2)
99

10-
build: bin/csvcols bin/csvrows bin/csvfind bin/csvjoin bin/jsoncols bin/jsonrange bin/xlsx2json bin/xlsx2csv bin/csv2mdtable bin/csv2xlsx bin/csv2json bin/vcard2json bin/jsonmunge bin/jsonjoin bin/findfile bin/finddir bin/mergepath bin/reldate bin/range bin/timefmt bin/urlparse
10+
build: bin/csvcols bin/csvrows bin/csvfind bin/csvjoin bin/jsoncols bin/jsonrange bin/xlsx2json bin/xlsx2csv bin/csv2mdtable bin/csv2xlsx bin/csv2json bin/vcard2json bin/jsonjoin bin/jsonmunge bin/findfile bin/finddir bin/mergepath bin/reldate bin/range bin/timefmt bin/urlparse
1111

1212

1313
bin/csvcols: datatools.go cmds/csvcols/csvcols.go
@@ -104,23 +104,23 @@ install:
104104
env GOBIN=$(HOME)/bin go install cmds/csvrows/csvrows.go
105105
env GOBIN=$(HOME)/bin go install cmds/csvfind/csvfind.go
106106
env GOBIN=$(HOME)/bin go install cmds/csvjoin/csvjoin.go
107-
env GOBIN=$(HOME)/bin go install cmds/jsoncols/jsoncols.go
108-
env GOBIN=$(HOME)/bin go install cmds/jsonrange/jsonrange.go
109-
env GOBIN=$(HOME)/bin go install cmds/xlsx2json/xlsx2json.go
110-
env GOBIN=$(HOME)/bin go install cmds/xlsx2csv/xlsx2csv.go
111107
env GOBIN=$(HOME)/bin go install cmds/csv2mdtable/csv2mdtable.go
112108
env GOBIN=$(HOME)/bin go install cmds/csv2xlsx/csv2xlsx.go
113109
env GOBIN=$(HOME)/bin go install cmds/csv2json/csv2json.go
114-
env GOBIN=$(HOME)/bin go install cmds/vcard2json/vcard2json.go
115-
env GOBIN=$(HOME)/bin go install cmds/jsonmunge/jsonmunge.go
116-
env GOBIN=$(HOME)/bin go install cmds/jsonjoin/jsonjoin.go
117110
env GOBIN=$(HOME)/bin go install cmds/findfile/findfile.go
118111
env GOBIN=$(HOME)/bin go install cmds/finddir/finddir.go
112+
env GOBIN=$(HOME)/bin go install cmds/jsoncols/jsoncols.go
113+
env GOBIN=$(HOME)/bin go install cmds/jsonrange/jsonrange.go
114+
env GOBIN=$(HOME)/bin go install cmds/jsonmunge/jsonmunge.go
115+
env GOBIN=$(HOME)/bin go install cmds/jsonjoin/jsonjoin.go
119116
env GOBIN=$(HOME)/bin go install cmds/mergepath/mergepath.go
120117
env GOBIN=$(HOME)/bin go install cmds/reldate/reldate.go
121118
env GOBIN=$(HOME)/bin go install cmds/range/range.go
122119
env GOBIN=$(HOME)/bin go install cmds/timefmt/timefmt.go
123120
env GOBIN=$(HOME)/bin go install cmds/urlparse/urlparse.go
121+
env GOBIN=$(HOME)/bin go install cmds/vcard2json/vcard2json.go
122+
env GOBIN=$(HOME)/bin go install cmds/xlsx2json/xlsx2json.go
123+
env GOBIN=$(HOME)/bin go install cmds/xlsx2csv/xlsx2csv.go
124124

125125
dist/linux-amd64:
126126
mkdir -p dist/bin

‎cmds/jsoncols/jsoncols.go

+3
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,11 @@ func handleError(err error, exitCode int) {
102102
func init() {
103103
// Basic Options
104104
flag.BoolVar(&showHelp, "h", false, "display help")
105+
flag.BoolVar(&showHelp, "help", false, "display help")
105106
flag.BoolVar(&showLicense, "l", false, "display license")
107+
flag.BoolVar(&showLicense, "license", false, "display license")
106108
flag.BoolVar(&showVersion, "v", false, "display version")
109+
flag.BoolVar(&showVersion, "version", false, "display version")
107110
flag.StringVar(&inputFName, "i", "", "input filename")
108111
flag.StringVar(&inputFName, "input", "", "input filename")
109112
flag.StringVar(&outputFName, "o", "", "output filename")

‎cmds/jsonmunge/jsonmunge.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,10 @@ This would yeild
7171
func init() {
7272
// Basic Options
7373
flag.BoolVar(&showHelp, "h", false, "display help")
74-
flag.BoolVar(&showLicense, "l", false, "display license")
74+
flag.BoolVar(&showHelp, "help", false, "display help")
75+
flag.BoolVar(&showLicense, "license", false, "display license")
7576
flag.BoolVar(&showVersion, "v", false, "display version")
77+
flag.BoolVar(&showVersion, "version", false, "display version")
7678
flag.StringVar(&inputFName, "i", "", "input filename")
7779
flag.StringVar(&inputFName, "input", "", "input filename")
7880
flag.StringVar(&outputFName, "o", "", "output filename")

‎cmds/jsonrange/jsonrange.go

+3
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,11 @@ func handleError(err error, exitCode int) {
238238
func init() {
239239
// Standard Options
240240
flag.BoolVar(&showHelp, "h", false, "display help")
241+
flag.BoolVar(&showHelp, "help", false, "display help")
241242
flag.BoolVar(&showLicense, "l", false, "display license")
243+
flag.BoolVar(&showLicense, "license", false, "display license")
242244
flag.BoolVar(&showVersion, "v", false, "display version")
245+
flag.BoolVar(&showVersion, "version", false, "display version")
243246
flag.StringVar(&inputFName, "i", "", "read JSON from file")
244247
flag.StringVar(&inputFName, "input", "", "read JSON from file")
245248
flag.StringVar(&outputFName, "o", "", "write to output file")

‎cmds/range/range.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ func init() {
9393
)
9494

9595
// Standard Options
96-
flag.BoolVar(&showHelp, "help", false, "display help")
9796
flag.BoolVar(&showHelp, "h", false, "display help")
97+
flag.BoolVar(&showHelp, "help", false, "display help")
9898
flag.BoolVar(&showLicense, "l", false, "display license")
9999
flag.BoolVar(&showLicense, "license", false, "display license")
100100
flag.BoolVar(&showVersion, "v", false, "display version")

‎cmds/reldate/reldate.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ func init() {
132132
)
133133

134134
// Standard Options
135-
flag.BoolVar(&showHelp, "help", false, "display help")
136135
flag.BoolVar(&showHelp, "h", false, "display help")
136+
flag.BoolVar(&showHelp, "help", false, "display help")
137137
flag.BoolVar(&showLicense, "l", false, "display license")
138138
flag.BoolVar(&showLicense, "license", false, "display license")
139139
flag.BoolVar(&showVersion, "v", false, "display version")

‎cmds/timefmt/timefmt.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,11 @@ Yields "02 Jul 16 08:08 UTC"
7575

7676
func init() {
7777
flag.BoolVar(&showHelp, "h", false, "display help")
78-
flag.BoolVar(&showVersion, "v", false, "display version")
78+
flag.BoolVar(&showHelp, "help", false, "display help")
7979
flag.BoolVar(&showLicense, "l", false, "display license")
80+
flag.BoolVar(&showLicense, "license", false, "display license")
81+
flag.BoolVar(&showVersion, "v", false, "display version")
82+
flag.BoolVar(&showVersion, "version", false, "display version")
8083

8184
flag.BoolVar(&useUTC, "utc", false, "timestamps in UTC")
8285
flag.StringVar(&inputFormat, "input", inputFormat, "Set format for input")

‎cmds/urlparse/urlparse.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ func init() {
100100
)
101101

102102
// Standard Options
103-
flag.BoolVar(&showHelp, "help", false, "display help")
104103
flag.BoolVar(&showHelp, "h", false, "display help")
104+
flag.BoolVar(&showHelp, "help", false, "display help")
105105
flag.BoolVar(&showLicense, "l", false, "display license")
106106
flag.BoolVar(&showLicense, "license", false, "display license")
107107
flag.BoolVar(&showVersion, "v", false, "display verison")

0 commit comments

Comments
 (0)