Skip to content

Commit 4385d62

Browse files
committed
Added jsonjoin cli, bumped version number
1 parent c3b736c commit 4385d62

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

Makefile

Lines changed: 9 additions & 1 deletion
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/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/jsonmunge bin/jsonjoin 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
@@ -49,6 +49,9 @@ bin/vcard2json: datatools.go cmds/vcard2json/vcard2json.go
4949
bin/jsonmunge: datatools.go cmds/jsonmunge/jsonmunge.go
5050
go build -o bin/jsonmunge cmds/jsonmunge/jsonmunge.go
5151

52+
bin/jsonjoin: datatools.go cmds/jsonjoin/jsonjoin.go
53+
go build -o bin/jsonjoin cmds/jsonjoin/jsonjoin.go
54+
5255
bin/findfile: datatools.go cmds/findfile/findfile.go
5356
go build -o bin/findfile cmds/findfile/findfile.go
5457

@@ -110,6 +113,7 @@ install:
110113
env GOBIN=$(HOME)/bin go install cmds/csv2json/csv2json.go
111114
env GOBIN=$(HOME)/bin go install cmds/vcard2json/vcard2json.go
112115
env GOBIN=$(HOME)/bin go install cmds/jsonmunge/jsonmunge.go
116+
env GOBIN=$(HOME)/bin go install cmds/jsonjoin/jsonjoin.go
113117
env GOBIN=$(HOME)/bin go install cmds/findfile/findfile.go
114118
env GOBIN=$(HOME)/bin go install cmds/finddir/finddir.go
115119
env GOBIN=$(HOME)/bin go install cmds/mergepath/mergepath.go
@@ -132,6 +136,7 @@ dist/linux-amd64:
132136
env GOOS=linux GOARCH=amd64 go build -o dist/bin/csv2xlsx cmds/csv2xlsx/csv2xlsx.go
133137
env GOOS=linux GOARCH=amd64 go build -o dist/bin/csv2json cmds/csv2json/csv2json.go
134138
env GOOS=linux GOARCH=amd64 go build -o dist/bin/jsonmunge cmds/jsonmunge/jsonmunge.go
139+
env GOOS=linux GOARCH=amd64 go build -o dist/bin/jsonjoin cmds/jsonjoin/jsonjoin.go
135140
env GOOS=linux GOARCH=amd64 go build -o dist/bin/vcard2json cmds/vcard2json/vcard2json.go
136141
env GOOS=linux GOARCH=amd64 go build -o dist/bin/findfile cmds/findfile/findfile.go
137142
env GOOS=linux GOARCH=amd64 go build -o dist/bin/finddir cmds/finddir/finddir.go
@@ -159,6 +164,7 @@ dist/macosx-amd64:
159164
env GOOS=darwin GOARCH=amd64 go build -o dist/bin/csv2json cmds/csv2json/csv2json.go
160165
env GOOS=darwin GOARCH=amd64 go build -o dist/bin/vcard2json cmds/vcard2json/vcard2json.go
161166
env GOOS=darwin GOARCH=amd64 go build -o dist/bin/jsonmunge cmds/jsonmunge/jsonmunge.go
167+
env GOOS=darwin GOARCH=amd64 go build -o dist/bin/jsonjoin cmds/jsonjoin/jsonjoin.go
162168
env GOOS=darwin GOARCH=amd64 go build -o dist/bin/findfile cmds/findfile/findfile.go
163169
env GOOS=darwin GOARCH=amd64 go build -o dist/bin/finddir cmds/finddir/finddir.go
164170
env GOOS=darwin GOARCH=amd64 go build -o dist/bin/mergepath cmds/mergepath/mergepath.go
@@ -186,6 +192,7 @@ dist/windows-amd64:
186192
env GOOS=windows GOARCH=amd64 go build -o dist/bin/csv2json.exe cmds/csv2json/csv2json.go
187193
env GOOS=windows GOARCH=amd64 go build -o dist/bin/vcard2json.exe cmds/vcard2json/vcard2json.go
188194
env GOOS=windows GOARCH=amd64 go build -o dist/bin/jsonmunge.exe cmds/jsonmunge/jsonmunge.go
195+
env GOOS=windows GOARCH=amd64 go build -o dist/bin/jsonjoin.exe cmds/jsonjoin/jsonjoin.go
189196
env GOOS=windows GOARCH=amd64 go build -o dist/bin/findfile.exe cmds/findfile/findfile.go
190197
env GOOS=windows GOARCH=amd64 go build -o dist/bin/finddir.exe cmds/finddir/finddir.go
191198
env GOOS=windows GOARCH=amd64 go build -o dist/bin/mergepath.exe cmds/mergepath/mergepath.go
@@ -214,6 +221,7 @@ dist/raspbian-arm7:
214221
env GOOS=linux GOARCH=arm GOARM=7 go build -o dist/bin/csv2json cmds/csv2json/csv2json.go
215222
env GOOS=linux GOARCH=arm GOARM=7 go build -o dist/bin/vcard2json cmds/vcard2json/vcard2json.go
216223
env GOOS=linux GOARCH=arm GOARM=7 go build -o dist/bin/jsonmunge cmds/jsonmunge/jsonmunge.go
224+
env GOOS=linux GOARCH=arm GOARM=7 go build -o dist/bin/jsonjoin cmds/jsonjoin/jsonjoin.go
217225
env GOOS=linux GOARCH=arm GOARM=7 go build -o dist/bin/findfile cmds/findfile/findfile.go
218226
env GOOS=linux GOARCH=arm GOARM=7 go build -o dist/bin/finddir cmds/finddir/finddir.go
219227
env GOOS=linux GOARCH=arm GOARM=7 go build -o dist/bin/mergepath cmds/mergepath/mergepath.go

datatools.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
)
3636

3737
const (
38-
Version = "v0.0.11"
38+
Version = "v0.0.12"
3939

4040
LicenseText = `
4141
%s %s

0 commit comments

Comments
 (0)