commiting to main

Author: rsdoiel

INSTALL.md

@@ -23,8 +23,8 @@ Compiled version
 
 This is generalized instructions for a release. 
 
-Compiled versions are available for Mac OS X (amd64 and M1 processor, macos-amd64 and macos-arm64), Linux (amd64 process, linux-amd64), 
-Windows (amd64 and arm64 processor, windows-amd64 and windows-arm64) and Rapsberry Pi (arm7 processor, raspbian-arm7)
+Compiled versions are available for Mac OS X (Intel and M1 processor, macos-x86_64 and macOS-arm64), Linux (Intel process, Linux-x86_64), 
+Windows (Intel and arm64 processor, windows-x86_64 and Windows-arm64) and Rapsberry Pi (arm7 processor, RaspberryPiOS-arm7)
 
 VERSION_NUMBER is a [symantic version number](http://semver.org/) (e.g. v0.1.2)
 
@@ -36,19 +36,20 @@ For all the released version go to the project page on Github and click latest r
 
 | Platform       | Zip Filename                                      |
 |----------------|---------------------------------------------------|
-| Windows        | datatools-VERSION_NUMBER-windows-amd64.zip        |
-| Windows        | datatools-VERSION_NUMBER-windows-arm64.zip        |
-| Mac OS X       | datatools-VERSION_NUMBER-macos-amd64.zip          |
-| Mac OS X       | datatools-VERSION_NUMBER-macos-arm64.zip          |
-| Linux/Intel    | datatools-VERSION_NUMBER-linux-amd64.zip          |
-| Raspbery Pi OS | datatools-VERSION_NUMBER-raspberry_pi_os-arm7.zip |
+| Windows        | datatools-VERSION_NUMBER-Windows-x86_64.zip       |
+| Windows        | datatools-VERSION_NUMBER-Windows-arm64.zip        |
+| Mac OS X       | datatools-VERSION_NUMBER-macOS-x86_64.zip         |
+| Mac OS X       | datatools-VERSION_NUMBER-macOS-arm64.zip          |
+| Linux/Intel    | datatools-VERSION_NUMBER-Linux-x86_64.zip         |
+| Linux/ARM 64   | datatools-VERSION_NUMBER-Linux-aarch64.zip        |
+| Raspbery Pi OS | datatools-VERSION_NUMBER-RaspberryPiOS-arm7.zip   |
 
 
 The basic recipe
 ----------------
 
 + Find the Zip file listed matching the architecture you're running and download it
-    + (e.g. if you're on a Windows 10 laptop/Surface with a amd64 style CPU you'd choose the Zip file with "windows-amd64" in the name).
+    + (e.g. if you're on a Windows 10 laptop/Surface with a Intel style CPU you'd choose the Zip file with "windows-x86_64" in the name).
 + Download the zip file and unzip the file.  
 + Copy the contents of the folder named "bin" to a folder that is in your path 
     + (e.g. "$HOME/bin" is common).
@@ -68,11 +69,11 @@ The basic recipe
 Here's an example of the commands run in the Terminal App after downloading the 
 zip file.
 
-#### Intel (amd64) Hardware
+#### Intel (x86_64) Hardware
 
 ```shell
     cd Downloads/
-    unzip datatools-*-macos-amd64.zip
+    unzip datatools-*-macos-x86_64.zip
     mkdir -p $HOME/bin
     mv -v bin/* $HOME/bin/
     export PATH=$HOME/bin:$PATH
@@ -103,11 +104,11 @@ zip file.
 Here's an example of the commands run in from the Bash shell on Windows 10 after
 downloading the zip file.
 
-#### Intel (amd64) Hardware
+#### Intel (x86_64) Hardware
 
 ```shell
     cd Downloads/
-    unzip datatools-*-windows-amd64.zip
+    unzip datatools-*-windows-x86_64.zip
     mkdir -p $HOME/bin
     mv -v bin/* $HOME/bin/
     export PATH=$HOME/bin:$PATH
@@ -139,7 +140,7 @@ downloading the zip file.
 
 ```shell
     cd Downloads/
-    unzip datatools-*-linux-amd64.zip
+    unzip datatools-*-linux-x86_64.zip
     mkdir -p $HOME/bin
     cp -v bin/* $HOME/bin/
     export PATH=$HOME/bin:$PATH

install.html

@@ -33,10 +33,10 @@ <h2 id="quick-install-using-curl">Quick install using curl</h2>
 <pre><code>curl https://caltechlibrary.github.io/datatools/installer.sh | sh</code></pre>
 <h2 id="compiled-version">Compiled version</h2>
 <p>This is generalized instructions for a release.</p>
-<p>Compiled versions are available for Mac OS X (amd64 and M1 processor,
-macos-amd64 and macos-arm64), Linux (amd64 process, linux-amd64),
-Windows (amd64 and arm64 processor, windows-amd64 and windows-arm64) and
-Rapsberry Pi (arm7 processor, raspbian-arm7)</p>
+<p>Compiled versions are available for Mac OS X (Intel and M1 processor,
+macos-x86_64 and macOS-arm64), Linux (Intel process, Linux-x86_64),
+Windows (Intel and arm64 processor, windows-x86_64 and Windows-arm64)
+and Rapsberry Pi (arm7 processor, RaspberryPiOS-arm7)</p>
 <p>VERSION_NUMBER is a <a href="http://semver.org/">symantic version
 number</a> (e.g. v0.1.2)</p>
 <p>For all the released version go to the project page on Github and
@@ -54,27 +54,31 @@ <h2 id="compiled-version">Compiled version</h2>
 <tbody>
 <tr class="odd">
 <td>Windows</td>
-<td>datatools-VERSION_NUMBER-windows-amd64.zip</td>
+<td>datatools-VERSION_NUMBER-Windows-x86_64.zip</td>
 </tr>
 <tr class="even">
 <td>Windows</td>
-<td>datatools-VERSION_NUMBER-windows-arm64.zip</td>
+<td>datatools-VERSION_NUMBER-Windows-arm64.zip</td>
 </tr>
 <tr class="odd">
 <td>Mac OS X</td>
-<td>datatools-VERSION_NUMBER-macos-amd64.zip</td>
+<td>datatools-VERSION_NUMBER-macOS-x86_64.zip</td>
 </tr>
 <tr class="even">
 <td>Mac OS X</td>
-<td>datatools-VERSION_NUMBER-macos-arm64.zip</td>
+<td>datatools-VERSION_NUMBER-macOS-arm64.zip</td>
 </tr>
 <tr class="odd">
 <td>Linux/Intel</td>
-<td>datatools-VERSION_NUMBER-linux-amd64.zip</td>
+<td>datatools-VERSION_NUMBER-Linux-x86_64.zip</td>
 </tr>
 <tr class="even">
+<td>Linux/ARM 64</td>
+<td>datatools-VERSION_NUMBER-Linux-aarch64.zip</td>
+</tr>
+<tr class="odd">
 <td>Raspbery Pi OS</td>
-<td>datatools-VERSION_NUMBER-raspberry_pi_os-arm7.zip</td>
+<td>datatools-VERSION_NUMBER-RaspberryPiOS-arm7.zip</td>
 </tr>
 </tbody>
 </table>
@@ -83,8 +87,8 @@ <h2 id="the-basic-recipe">The basic recipe</h2>
 <li>Find the Zip file listed matching the architecture you’re running
 and download it
 <ul>
-<li>(e.g. if you’re on a Windows 10 laptop/Surface with a amd64 style
-CPU you’d choose the Zip file with “windows-amd64” in the name).</li>
+<li>(e.g. if you’re on a Windows 10 laptop/Surface with a Intel style
+CPU you’d choose the Zip file with “windows-x86_64” in the name).</li>
 </ul></li>
 <li>Download the zip file and unzip the file.<br />
 </li>
@@ -110,9 +114,9 @@ <h3 id="mac-os">Mac OS</h3>
 </ol>
 <p>Here’s an example of the commands run in the Terminal App after
 downloading the zip file.</p>
-<h4 id="intel-amd64-hardware">Intel (amd64) Hardware</h4>
+<h4 id="intel-x86_64-hardware">Intel (x86_64) Hardware</h4>
 <pre class="shell"><code>    cd Downloads/
-    unzip datatools-*-macos-amd64.zip
+    unzip datatools-*-macos-x86_64.zip
     mkdir -p $HOME/bin
     mv -v bin/* $HOME/bin/
     export PATH=$HOME/bin:$PATH
@@ -135,9 +139,9 @@ <h3 id="windows">Windows</h3>
 </ol>
 <p>Here’s an example of the commands run in from the Bash shell on
 Windows 10 after downloading the zip file.</p>
-<h4 id="intel-amd64-hardware-1">Intel (amd64) Hardware</h4>
+<h4 id="intel-x86_64-hardware-1">Intel (x86_64) Hardware</h4>
 <pre class="shell"><code>    cd Downloads/
-    unzip datatools-*-windows-amd64.zip
+    unzip datatools-*-windows-x86_64.zip
     mkdir -p $HOME/bin
     mv -v bin/* $HOME/bin/
     export PATH=$HOME/bin:$PATH
@@ -159,7 +163,7 @@ <h3 id="linux">Linux</h3>
 <p>Here’s an example of the commands run in from the Bash shell after
 downloading the zip file.</p>
 <pre class="shell"><code>    cd Downloads/
-    unzip datatools-*-linux-amd64.zip
+    unzip datatools-*-linux-x86_64.zip
     mkdir -p $HOME/bin
     cp -v bin/* $HOME/bin/
     export PATH=$HOME/bin:$PATH