Skip to content

Commit be95ff2

Browse files
committed
prep for v1.0.4 release
1 parent d45eef6 commit be95ff2

File tree

8 files changed

+43
-40
lines changed

8 files changed

+43
-40
lines changed

INSTALL.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ For all the released version go to the project page on Github and click latest r
2020
> https://github.com/caltechlibrary/datatools/releases/latest
2121
2222

23-
| Platform | Zip Filename |
24-
|-------------|--------------------------------------------|
25-
| Windows | datatools-VERSION_NUMBER-windows-amd64.zip |
26-
| Mac OS X | datatools-VERSION_NUMBER-macos-amd64.zip |
27-
| Mac OS X | datatools-VERSION_NUMBER-macos-arm64.zip |
28-
| Linux/Intel | datatools-VERSION_NUMBER-linux-amd64.zip |
29-
| Raspbery Pi | datatools-VERSION_NUMBER-raspbian-arm7.zip |
23+
| Platform | Zip Filename |
24+
|----------------|---------------------------------------------------|
25+
| Windows | datatools-VERSION_NUMBER-windows-amd64.zip |
26+
| Mac OS X | datatools-VERSION_NUMBER-macos-amd64.zip |
27+
| Mac OS X | datatools-VERSION_NUMBER-macos-arm64.zip |
28+
| Linux/Intel | datatools-VERSION_NUMBER-linux-amd64.zip |
29+
| Raspbery Pi OS | datatools-VERSION_NUMBER-raspberry_pi_os-arm7.zip |
3030

3131

3232
The basic recipe
@@ -116,7 +116,7 @@ downloading the zip file.
116116

117117
```shell
118118
cd Downloads/
119-
unzip datatools-*-raspbian-arm7.zip
119+
unzip datatools-*-raspberry_pi_os-arm7.zip
120120
mkdir -p $HOME/bin
121121
cp -v bin/* $HOME/bin/
122122
export PATH=$HOME/bin:$PATH

Makefile

+5-5
Original file line numberDiff line numberDiff line change
@@ -85,35 +85,35 @@ uninstall: .FORCE
8585
dist/linux-amd64: $(PROGRAMS)
8686
@mkdir -p dist/bin
8787
@for FNAME in $(PROGRAMS); do env GOOS=linux GOARCH=amd64 go build -o dist/bin/$$FNAME cmd/$$FNAME/*.go; done
88-
@cd dist && zip -r $(PROJECT)-$(VERSION)-linux-amd64.zip LICENSE codemeta.json CITATION.cff *.md bin/* docs/* how-to/* demos/*
88+
@cd dist && zip -r $(PROJECT)-v$(VERSION)-linux-amd64.zip LICENSE codemeta.json CITATION.cff *.md bin/* docs/* how-to/* demos/*
8989
@rm -fR dist/bin
9090

9191

9292
dist/macos-amd64: $(PROGRAMS)
9393
@mkdir -p dist/bin
9494
@for FNAME in $(PROGRAMS); do env GOOS=darwin GOARCH=amd64 go build -o dist/bin/$$FNAME cmd/$$FNAME/*.go; done
95-
@cd dist && zip -r $(PROJECT)-$(VERSION)-macos-amd64.zip LICENSE codemeta.json CITATION.cff *.md bin/* docs/* how-to/* demos/*
95+
@cd dist && zip -r $(PROJECT)-v$(VERSION)-macos-amd64.zip LICENSE codemeta.json CITATION.cff *.md bin/* docs/* how-to/* demos/*
9696
@rm -fR dist/bin
9797

9898

9999
dist/macos-arm64: $(PROGRAMS)
100100
@mkdir -p dist/bin
101101
@for FNAME in $(PROGRAMS); do env GOOS=darwin GOARCH=arm64 go build -o dist/bin/$$FNAME cmd/$$FNAME/*.go; done
102-
@cd dist && zip -r $(PROJECT)-$(VERSION)-macos-arm64.zip LICENSE codemeta.json CITATION.cff *.md bin/* docs/* how-to/* demos/*
102+
@cd dist && zip -r $(PROJECT)-v$(VERSION)-macos-arm64.zip LICENSE codemeta.json CITATION.cff *.md bin/* docs/* how-to/* demos/*
103103
@rm -fR dist/bin
104104

105105

106106
dist/windows-amd64: $(PROGRAMS)
107107
@mkdir -p dist/bin
108108
@for FNAME in $(PROGRAMS); do env GOOS=windows GOARCH=amd64 go build -o dist/bin/$$FNAME.exe cmd/$$FNAME/*.go; done
109-
@cd dist && zip -r $(PROJECT)-$(VERSION)-windows-amd64.zip LICENSE codemeta.json CITATION.cff *.md bin/* docs/* how-to/* demos/*
109+
@cd dist && zip -r $(PROJECT)-v$(VERSION)-windows-amd64.zip LICENSE codemeta.json CITATION.cff *.md bin/* docs/* how-to/* demos/*
110110
@rm -fR dist/bin
111111

112112

113113
dist/raspbian-arm7: $(PROGRAMS)
114114
@mkdir -p dist/bin
115115
@for FNAME in $(PROGRAMS); do env GOOS=linux GOARCH=arm GOARM=7 go build -o dist/bin/$$FNAME cmd/$$FNAME/*.go; done
116-
@cd dist && zip -r $(PROJECT)-$(VERSION)-raspberry_pi_os-arm7.zip LICENSE codemeta.json CITATION.cff *.md bin/* docs/* how-to/* demos/*
116+
@cd dist && zip -r $(PROJECT)-v$(VERSION)-raspberry_pi_os-arm7.zip LICENSE codemeta.json CITATION.cff *.md bin/* docs/* how-to/* demos/*
117117
@rm -fR dist/bin
118118

119119
distribute_docs:

how-to/jsoncols/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ <h1 id="using-jsoncols">
4343
If myblob.json contained
4444
</p>
4545
<div id="cb1" class="sourceCode">
46-
<pre class="sourceCode json"><code class="sourceCode json"><span id="cb1-1"><a href="#cb1-1"></a> <span class="fu">{</span><span class="dt">&quot;name&quot;</span><span class="fu">:</span> <span class="st">&quot;Doe, Jane&quot;</span><span class="fu">,</span> <span class="dt">&quot;email&quot;</span><span class="fu">:</span><span class="st">&quot;[email protected]&quot;</span><span class="fu">,</span> <span class="dt">&quot;age&quot;</span><span class="fu">:</span> <span class="dv">42</span><span class="fu">}</span></span></code></pre>
46+
<pre class="sourceCode json"><code class="sourceCode json"><span id="cb1-1"><a href="#cb1-1" aria-hidden="true"></a> <span class="fu">{</span><span class="dt">&quot;name&quot;</span><span class="fu">:</span> <span class="st">&quot;Doe, Jane&quot;</span><span class="fu">,</span> <span class="dt">&quot;email&quot;</span><span class="fu">:</span><span class="st">&quot;[email protected]&quot;</span><span class="fu">,</span> <span class="dt">&quot;age&quot;</span><span class="fu">:</span> <span class="dv">42</span><span class="fu">}</span></span></code></pre>
4747
</div>
4848
<p>
4949
Getting just the name could be done with

how-to/jsonjoin/index.html

+20-20
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ <h1 id="using-jsonjoin">
5050
profile.json contains
5151
</p>
5252
<div id="cb2" class="sourceCode">
53-
<pre class="sourceCode json"><code class="sourceCode json"><span id="cb2-1"><a href="#cb2-1"></a> <span class="fu">{</span> <span class="dt">&quot;name&quot;</span><span class="fu">:</span> <span class="st">&quot;Doe, Jane&quot;</span><span class="fu">,</span> <span class="dt">&quot;bio&quot;</span><span class="fu">:</span> <span class="st">&quot;World renowned geophysist.&quot;</span><span class="fu">,</span></span>
54-
<span id="cb2-2"><a href="#cb2-2"></a> <span class="dt">&quot;email&quot;</span><span class="fu">:</span> <span class="st">&quot;[email protected]&quot;</span> <span class="fu">}</span></span></code></pre>
53+
<pre class="sourceCode json"><code class="sourceCode json"><span id="cb2-1"><a href="#cb2-1" aria-hidden="true"></a> <span class="fu">{</span> <span class="dt">&quot;name&quot;</span><span class="fu">:</span> <span class="st">&quot;Doe, Jane&quot;</span><span class="fu">,</span> <span class="dt">&quot;bio&quot;</span><span class="fu">:</span> <span class="st">&quot;World renowned geophysist.&quot;</span><span class="fu">,</span></span>
54+
<span id="cb2-2"><a href="#cb2-2" aria-hidden="true"></a> <span class="dt">&quot;email&quot;</span><span class="fu">:</span> <span class="st">&quot;[email protected]&quot;</span> <span class="fu">}</span></span></code></pre>
5555
</div>
5656
<p>
5757
A simple join of person.json with profile.json (note the -create option)
@@ -61,12 +61,12 @@ <h1 id="using-jsonjoin">
6161
would yield and object like
6262
</p>
6363
<div id="cb4" class="sourceCode">
64-
<pre class="sourceCode json"><code class="sourceCode json"><span id="cb4-1"><a href="#cb4-1"></a> <span class="fu">{</span></span>
65-
<span id="cb4-2"><a href="#cb4-2"></a> <span class="dt">&quot;person&quot;</span><span class="fu">:</span> <span class="fu">{</span> <span class="dt">&quot;name&quot;</span><span class="fu">:</span> <span class="st">&quot;Doe, Jane&quot;</span><span class="fu">,</span> <span class="dt">&quot;email&quot;</span><span class="fu">:</span><span class="st">&quot;[email protected]&quot;</span><span class="fu">,</span></span>
66-
<span id="cb4-3"><a href="#cb4-3"></a> <span class="dt">&quot;age&quot;</span><span class="fu">:</span> <span class="dv">42</span><span class="fu">},</span></span>
67-
<span id="cb4-4"><a href="#cb4-4"></a> <span class="dt">&quot;profile&quot;</span><span class="fu">:</span> <span class="fu">{</span> <span class="dt">&quot;name&quot;</span><span class="fu">:</span> <span class="st">&quot;Doe, Jane&quot;</span><span class="fu">,</span> <span class="dt">&quot;bio&quot;</span><span class="fu">:</span> <span class="st">&quot;World renowned geophysist.&quot;</span><span class="fu">,</span></span>
68-
<span id="cb4-5"><a href="#cb4-5"></a> <span class="dt">&quot;email&quot;</span><span class="fu">:</span> <span class="st">&quot;[email protected]&quot;</span> <span class="fu">}</span></span>
69-
<span id="cb4-6"><a href="#cb4-6"></a> <span class="fu">}</span></span></code></pre>
64+
<pre class="sourceCode json"><code class="sourceCode json"><span id="cb4-1"><a href="#cb4-1" aria-hidden="true"></a> <span class="fu">{</span></span>
65+
<span id="cb4-2"><a href="#cb4-2" aria-hidden="true"></a> <span class="dt">&quot;person&quot;</span><span class="fu">:</span> <span class="fu">{</span> <span class="dt">&quot;name&quot;</span><span class="fu">:</span> <span class="st">&quot;Doe, Jane&quot;</span><span class="fu">,</span> <span class="dt">&quot;email&quot;</span><span class="fu">:</span><span class="st">&quot;[email protected]&quot;</span><span class="fu">,</span></span>
66+
<span id="cb4-3"><a href="#cb4-3" aria-hidden="true"></a> <span class="dt">&quot;age&quot;</span><span class="fu">:</span> <span class="dv">42</span><span class="fu">},</span></span>
67+
<span id="cb4-4"><a href="#cb4-4" aria-hidden="true"></a> <span class="dt">&quot;profile&quot;</span><span class="fu">:</span> <span class="fu">{</span> <span class="dt">&quot;name&quot;</span><span class="fu">:</span> <span class="st">&quot;Doe, Jane&quot;</span><span class="fu">,</span> <span class="dt">&quot;bio&quot;</span><span class="fu">:</span> <span class="st">&quot;World renowned geophysist.&quot;</span><span class="fu">,</span></span>
68+
<span id="cb4-5"><a href="#cb4-5" aria-hidden="true"></a> <span class="dt">&quot;email&quot;</span><span class="fu">:</span> <span class="st">&quot;[email protected]&quot;</span> <span class="fu">}</span></span>
69+
<span id="cb4-6"><a href="#cb4-6" aria-hidden="true"></a> <span class="fu">}</span></span></code></pre>
7070
</div>
7171
<p>
7272
Likewise if you want to treat person.json as the root object and add profile.json as a branch try
@@ -80,11 +80,11 @@ <h1 id="using-jsonjoin">
8080
this yields an object like
8181
</p>
8282
<div id="cb7" class="sourceCode">
83-
<pre class="sourceCode json"><code class="sourceCode json"><span id="cb7-1"><a href="#cb7-1"></a> <span class="fu">{</span></span>
84-
<span id="cb7-2"><a href="#cb7-2"></a> <span class="dt">&quot;name&quot;</span><span class="fu">:</span> <span class="st">&quot;Doe, Jane&quot;</span><span class="fu">,</span> <span class="dt">&quot;email&quot;</span><span class="fu">:</span><span class="st">&quot;[email protected]&quot;</span><span class="fu">,</span> <span class="dt">&quot;age&quot;</span><span class="fu">:</span> <span class="dv">42</span><span class="fu">,</span></span>
85-
<span id="cb7-3"><a href="#cb7-3"></a> <span class="dt">&quot;profile&quot;</span><span class="fu">:</span> <span class="fu">{</span> <span class="dt">&quot;name&quot;</span><span class="fu">:</span> <span class="st">&quot;Doe, Jane&quot;</span><span class="fu">,</span> <span class="dt">&quot;bio&quot;</span><span class="fu">:</span> <span class="st">&quot;World renowned geophysist.&quot;</span><span class="fu">,</span></span>
86-
<span id="cb7-4"><a href="#cb7-4"></a> <span class="dt">&quot;email&quot;</span><span class="fu">:</span> <span class="st">&quot;[email protected]&quot;</span> <span class="fu">}</span></span>
87-
<span id="cb7-5"><a href="#cb7-5"></a> <span class="fu">}</span></span></code></pre>
83+
<pre class="sourceCode json"><code class="sourceCode json"><span id="cb7-1"><a href="#cb7-1" aria-hidden="true"></a> <span class="fu">{</span></span>
84+
<span id="cb7-2"><a href="#cb7-2" aria-hidden="true"></a> <span class="dt">&quot;name&quot;</span><span class="fu">:</span> <span class="st">&quot;Doe, Jane&quot;</span><span class="fu">,</span> <span class="dt">&quot;email&quot;</span><span class="fu">:</span><span class="st">&quot;[email protected]&quot;</span><span class="fu">,</span> <span class="dt">&quot;age&quot;</span><span class="fu">:</span> <span class="dv">42</span><span class="fu">,</span></span>
85+
<span id="cb7-3"><a href="#cb7-3" aria-hidden="true"></a> <span class="dt">&quot;profile&quot;</span><span class="fu">:</span> <span class="fu">{</span> <span class="dt">&quot;name&quot;</span><span class="fu">:</span> <span class="st">&quot;Doe, Jane&quot;</span><span class="fu">,</span> <span class="dt">&quot;bio&quot;</span><span class="fu">:</span> <span class="st">&quot;World renowned geophysist.&quot;</span><span class="fu">,</span></span>
86+
<span id="cb7-4"><a href="#cb7-4" aria-hidden="true"></a> <span class="dt">&quot;email&quot;</span><span class="fu">:</span> <span class="st">&quot;[email protected]&quot;</span> <span class="fu">}</span></span>
87+
<span id="cb7-5"><a href="#cb7-5" aria-hidden="true"></a> <span class="fu">}</span></span></code></pre>
8888
</div>
8989
<p>
9090
You can modify this behavor with -update or -overwrite. Both options are order dependant (i.e. not associative, A update B does not necessarily equal B update A).
@@ -105,8 +105,8 @@ <h1 id="using-jsonjoin">
105105
would yield
106106
</p>
107107
<div id="cb9" class="sourceCode">
108-
<pre class="sourceCode json"><code class="sourceCode json"><span id="cb9-1"><a href="#cb9-1"></a> <span class="fu">{</span> <span class="dt">&quot;name&quot;</span><span class="fu">:</span> <span class="st">&quot;Doe, Jane&quot;</span><span class="fu">,</span> <span class="dt">&quot;email&quot;</span><span class="fu">:</span><span class="st">&quot;[email protected]&quot;</span><span class="fu">,</span> <span class="dt">&quot;age&quot;</span><span class="fu">:</span> <span class="dv">42</span><span class="fu">,</span></span>
109-
<span id="cb9-2"><a href="#cb9-2"></a> <span class="dt">&quot;bio&quot;</span><span class="fu">:</span> <span class="st">&quot;World renowned geophysist.&quot;</span> <span class="fu">}</span></span></code></pre>
108+
<pre class="sourceCode json"><code class="sourceCode json"><span id="cb9-1"><a href="#cb9-1" aria-hidden="true"></a> <span class="fu">{</span> <span class="dt">&quot;name&quot;</span><span class="fu">:</span> <span class="st">&quot;Doe, Jane&quot;</span><span class="fu">,</span> <span class="dt">&quot;email&quot;</span><span class="fu">:</span><span class="st">&quot;[email protected]&quot;</span><span class="fu">,</span> <span class="dt">&quot;age&quot;</span><span class="fu">:</span> <span class="dv">42</span><span class="fu">,</span></span>
109+
<span id="cb9-2"><a href="#cb9-2" aria-hidden="true"></a> <span class="dt">&quot;bio&quot;</span><span class="fu">:</span> <span class="st">&quot;World renowned geophysist.&quot;</span> <span class="fu">}</span></span></code></pre>
110110
</div>
111111
<p>
112112
Running
@@ -116,9 +116,9 @@ <h1 id="using-jsonjoin">
116116
would yield
117117
</p>
118118
<div id="cb11" class="sourceCode">
119-
<pre class="sourceCode json"><code class="sourceCode json"><span id="cb11-1"><a href="#cb11-1"></a> <span class="fu">{</span> <span class="dt">&quot;name&quot;</span><span class="fu">:</span> <span class="st">&quot;Doe, Jane&quot;</span><span class="fu">,</span> <span class="dt">&quot;age&quot;</span><span class="fu">:</span> <span class="dv">42</span><span class="fu">,</span></span>
120-
<span id="cb11-2"><a href="#cb11-2"></a> <span class="dt">&quot;bio&quot;</span><span class="fu">:</span> <span class="st">&quot;World renowned geophysist.&quot;</span><span class="fu">,</span></span>
121-
<span id="cb11-3"><a href="#cb11-3"></a> <span class="dt">&quot;email&quot;</span><span class="fu">:</span> <span class="st">&quot;[email protected]&quot;</span> <span class="fu">}</span></span></code></pre>
119+
<pre class="sourceCode json"><code class="sourceCode json"><span id="cb11-1"><a href="#cb11-1" aria-hidden="true"></a> <span class="fu">{</span> <span class="dt">&quot;name&quot;</span><span class="fu">:</span> <span class="st">&quot;Doe, Jane&quot;</span><span class="fu">,</span> <span class="dt">&quot;age&quot;</span><span class="fu">:</span> <span class="dv">42</span><span class="fu">,</span></span>
120+
<span id="cb11-2"><a href="#cb11-2" aria-hidden="true"></a> <span class="dt">&quot;bio&quot;</span><span class="fu">:</span> <span class="st">&quot;World renowned geophysist.&quot;</span><span class="fu">,</span></span>
121+
<span id="cb11-3"><a href="#cb11-3" aria-hidden="true"></a> <span class="dt">&quot;email&quot;</span><span class="fu">:</span> <span class="st">&quot;[email protected]&quot;</span> <span class="fu">}</span></span></code></pre>
122122
</div>
123123
<p>
124124
Running
@@ -128,8 +128,8 @@ <h1 id="using-jsonjoin">
128128
would yield
129129
</p>
130130
<div id="cb13" class="sourceCode">
131-
<pre class="sourceCode json"><code class="sourceCode json"><span id="cb13-1"><a href="#cb13-1"></a> <span class="fu">{</span> <span class="dt">&quot;name&quot;</span><span class="fu">:</span> <span class="st">&quot;Doe, Jane&quot;</span><span class="fu">,</span> <span class="dt">&quot;email&quot;</span><span class="fu">:</span><span class="st">&quot;[email protected]&quot;</span><span class="fu">,</span> <span class="dt">&quot;age&quot;</span><span class="fu">:</span> <span class="dv">42</span><span class="fu">,</span></span>
132-
<span id="cb13-2"><a href="#cb13-2"></a> <span class="dt">&quot;bio&quot;</span><span class="fu">:</span> <span class="st">&quot;World renowned geophysist.&quot;</span> <span class="fu">}</span></span></code></pre>
131+
<pre class="sourceCode json"><code class="sourceCode json"><span id="cb13-1"><a href="#cb13-1" aria-hidden="true"></a> <span class="fu">{</span> <span class="dt">&quot;name&quot;</span><span class="fu">:</span> <span class="st">&quot;Doe, Jane&quot;</span><span class="fu">,</span> <span class="dt">&quot;email&quot;</span><span class="fu">:</span><span class="st">&quot;[email protected]&quot;</span><span class="fu">,</span> <span class="dt">&quot;age&quot;</span><span class="fu">:</span> <span class="dv">42</span><span class="fu">,</span></span>
132+
<span id="cb13-2"><a href="#cb13-2" aria-hidden="true"></a> <span class="dt">&quot;bio&quot;</span><span class="fu">:</span> <span class="st">&quot;World renowned geophysist.&quot;</span> <span class="fu">}</span></span></code></pre>
133133
</div>
134134
</section>
135135

how-to/jsonmunge/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ <h1 id="using-jsonmunge">
4343
If person.json contained
4444
</p>
4545
<div id="cb1" class="sourceCode">
46-
<pre class="sourceCode json"><code class="sourceCode json"><span id="cb1-1"><a href="#cb1-1"></a> <span class="fu">{</span><span class="dt">&quot;name&quot;</span><span class="fu">:</span> <span class="st">&quot;Doe, Jane&quot;</span><span class="fu">,</span> <span class="dt">&quot;email&quot;</span><span class="fu">:</span><span class="st">&quot;[email protected]&quot;</span><span class="fu">,</span> <span class="dt">&quot;age&quot;</span><span class="fu">:</span> <span class="dv">42</span><span class="fu">}</span></span></code></pre>
46+
<pre class="sourceCode json"><code class="sourceCode json"><span id="cb1-1"><a href="#cb1-1" aria-hidden="true"></a> <span class="fu">{</span><span class="dt">&quot;name&quot;</span><span class="fu">:</span> <span class="st">&quot;Doe, Jane&quot;</span><span class="fu">,</span> <span class="dt">&quot;email&quot;</span><span class="fu">:</span><span class="st">&quot;[email protected]&quot;</span><span class="fu">,</span> <span class="dt">&quot;age&quot;</span><span class="fu">:</span> <span class="dv">42</span><span class="fu">}</span></span></code></pre>
4747
</div>
4848
<p>
4949
and the template, name.tmpl, contained

0 commit comments

Comments
 (0)