From e8de577470e84fef6bcd9590ae6b70cc37d455c6 Mon Sep 17 00:00:00 2001
From: Ben Soares <b.soares@dundee.ac.uk>
Date: Thu, 29 Oct 2020 14:19:51 +0000
Subject: [PATCH] JAL-3248 Fixed path typos in building.md/html and corrected
 shadow jar filename

---
 doc/building.html |   11 ++++++-----
 doc/building.md   |   13 ++++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/doc/building.html b/doc/building.html
index 44ffd5e..baf9e1f 100644
--- a/doc/building.html
+++ b/doc/building.html
@@ -712,7 +712,7 @@ git clone http://source.jalview.org/git/jalview.git
 cd jalview
 gradle shadowJar
 # run
-java -jar build/libs/jalview-all-11.jar
+java -jar build/libs/jalview-all-*-j11.jar
 
 # and/or create launcher
 gradle getdown
@@ -883,15 +883,16 @@ using</p>
 and all of the supporting libraries in <code>j11lib/*.jar</code> merged into one <code>.jar</code> archive
 file.  A default launching class (<code>MAIN-CLASS: jalview.bin.Launcher</code>) is specified in the <code>.jar</code>
 manifest file (<code>META/MANIFEST.MF</code>) so a start class doesn't need to be specified.</p>
-<p>Build the shadow jar file in <code>build/lib/jalview-all-11.jar</code> with</p>
+<p>Build the shadow jar file in <code>build/libs/jalview-all-VERSION-j11.jar</code> with</p>
 <pre><code class="language-bash">gradle shadowJar
 </code></pre>
-<p>and run it with</p>
-<pre><code class="language-bash">java -jar build/lib/jalview-all-11.jar
+<p><strong>NB</strong> <code>VERSION</code> will be replaced with a version number or &quot;<code>DEVELOPMENT</code>&quot; depending on how the branch is set up.</p>
+<p>Run it with</p>
+<pre><code class="language-bash">java -jar build/libs/jalview-all-VERSION-j11.jar
 </code></pre>
 <p>Because no arguments are required, most OSes will associate a <code>.jar</code> file with the
 <code>java</code> application (if this has been installed through the OS and not just a local
-unzip) as a <code>-jar</code> argument so you may find you can launch <code>jalview-all-11.jar</code>
+unzip) as a <code>-jar</code> argument so you may find you can launch <code>jalview-all-VERSION-j11.jar</code>
 just by double-clicking on it)!</p>
 <blockquote>
 <p>The <code>shadowJar</code> task is not a requirement for any other task, so to build the shadow
diff --git a/doc/building.md b/doc/building.md
index e8328d2..81446de 100644
--- a/doc/building.md
+++ b/doc/building.md
@@ -9,7 +9,7 @@ git clone http://source.jalview.org/git/jalview.git
 cd jalview
 gradle shadowJar
 # run
-java -jar build/libs/jalview-all-11.jar
+java -jar build/libs/jalview-all-*-j11.jar
 
 # and/or create launcher
 gradle getdown
@@ -248,20 +248,23 @@ and all of the supporting libraries in `j11lib/*.jar` merged into one `.jar` arc
 file.  A default launching class (`MAIN-CLASS: jalview.bin.Launcher`) is specified in the `.jar` 
 manifest file (`META/MANIFEST.MF`) so a start class doesn't need to be specified.
 
-Build the shadow jar file in `build/lib/jalview-all-11.jar` with
+Build the shadow jar file in `build/libs/jalview-all-VERSION-j11.jar` with
 
 ```bash
 gradle shadowJar
 ```
-and run it with
+
+__NB__ `VERSION` will be replaced with a version number or "`DEVELOPMENT`" depending on how the branch is set up.
+
+Run it with
 
 ```bash
-java -jar build/lib/jalview-all-11.jar
+java -jar build/libs/jalview-all-VERSION-j11.jar
 ```
 
 Because no arguments are required, most OSes will associate a `.jar` file with the 
 `java` application (if this has been installed through the OS and not just a local 
-unzip) as a `-jar` argument so you may find you can launch `jalview-all-11.jar` 
+unzip) as a `-jar` argument so you may find you can launch `jalview-all-VERSION-j11.jar` 
 just by double-clicking on it)!
 
 > The `shadowJar` task is not a requirement for any other task, so to build the shadow 
-- 
1.7.10.2