From 4bb35b8cff50e9aae2554b6685fc8e17a479a5b3 Mon Sep 17 00:00:00 2001
From: LHurst-UoB <44084717+LHurst-UoB@users.noreply.github.com>
Date: Thu, 31 Oct 2019 11:21:19 +0000
Subject: [PATCH 1/3] Updated macOS instructions for 10.15 (Catalina)

Bash is not default any more, it's now zsh.  Used Linux instructions as template for telling users how to run it.
---
 _includes/swc/setup.html | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/_includes/swc/setup.html b/_includes/swc/setup.html
index 6889d5b2..31231691 100644
--- a/_includes/swc/setup.html
+++ b/_includes/swc/setup.html
@@ -87,14 +87,15 @@ <h3>The Bash Shell</h3>
       </article>
       <article role="tabpanel" class="tab-pane active" id="shell-macos">
         <p>
-          The default shell in all versions of macOS is Bash, so no
-          need to install anything.  You access Bash from the Terminal
-          (found in
-          <code>/Applications/Utilities</code>).
+          The default shell prior to macOS 10.15 (Catalina) is Bash, and
+	  Bash is available in all versions, so no need to install anything.
+	  You access Bash from the Terminal (found in
+	  <code>/Applications/Utilities</code>).
           See the Git installation <a href="https://www.youtube.com/watch?v=9LQhwETCdwY ">video tutorial</a>
           for an example on how to open the Terminal.
-          You may want to keep
-          Terminal in your dock for this workshop.
+          You may want to keep Terminal in your dock for this workshop.
+	  If you are using macOS 10.15 (or later), you can run Bash by opening a
+          terminal and typing <code>bash</code>.
         </p>
       </article>
       <article role="tabpanel" class="tab-pane active" id="shell-linux">

From df392cdd41ee308ee1b4c81c361df4c1d9e89fc5 Mon Sep 17 00:00:00 2001
From: LHurst-UoB <44084717+LHurst-UoB@users.noreply.github.com>
Date: Thu, 19 Dec 2019 11:29:23 +0000
Subject: [PATCH 2/3] Updated macOS and Linux instructions

Added how to detect if bash is not the default shell and then run it.
---
 _includes/swc/setup.html | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/_includes/swc/setup.html b/_includes/swc/setup.html
index 31231691..36f1476a 100644
--- a/_includes/swc/setup.html
+++ b/_includes/swc/setup.html
@@ -87,24 +87,32 @@ <h3>The Bash Shell</h3>
       </article>
       <article role="tabpanel" class="tab-pane active" id="shell-macos">
         <p>
-          The default shell prior to macOS 10.15 (Catalina) is Bash, and
+          The default shell in some versions of macOS is Bash, and
 	  Bash is available in all versions, so no need to install anything.
 	  You access Bash from the Terminal (found in
 	  <code>/Applications/Utilities</code>).
           See the Git installation <a href="https://www.youtube.com/watch?v=9LQhwETCdwY ">video tutorial</a>
           for an example on how to open the Terminal.
           You may want to keep Terminal in your dock for this workshop.
-	  If you are using macOS 10.15 (or later), you can run Bash by opening a
-          terminal and typing <code>bash</code>.
+	</p>
+	<p>
+          To see if your default shell is bash type <code>echo $SHELL</code> in
+          Terminal and press the enter/return key.  If the message printed does
+	  not end '/bash' then your default is something else and you can run
+	  Bash by typing <code>bash</code>.
         </p>
       </article>
       <article role="tabpanel" class="tab-pane active" id="shell-linux">
         <p>
-          The default shell is usually Bash, but if your
-          machine is set up differently you can run it by opening a
-          terminal and typing <code>bash</code>.  There is no need to
+          The default shell is usually Bash and there is usually no need to
           install anything.
         </p>
+        <p>
+          To see if your default shell is bash type <code>echo $SHELL</code> in
+          a terminal and press the enter/return key.  If the message printed does
+	  not end '/bash' then your default is something else and you can run
+	  Bash by typing <code>bash</code>.
+        </p>
       </article>
     </div>
   </div>

From f7edfbacc2b448d02be284a3cc15c42d79586b4d Mon Sep 17 00:00:00 2001
From: LHurst-UoB <44084717+LHurst-UoB@users.noreply.github.com>
Date: Thu, 19 Dec 2019 15:02:50 +0000
Subject: [PATCH 3/3] Corrections from @mikerenfro

---
 _includes/swc/setup.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/_includes/swc/setup.html b/_includes/swc/setup.html
index 36f1476a..c0ca6f5f 100644
--- a/_includes/swc/setup.html
+++ b/_includes/swc/setup.html
@@ -96,9 +96,9 @@ <h3>The Bash Shell</h3>
           You may want to keep Terminal in your dock for this workshop.
 	</p>
 	<p>
-          To see if your default shell is bash type <code>echo $SHELL</code> in
+          To see if your default shell is Bash type <code>echo $SHELL</code> in
           Terminal and press the enter/return key.  If the message printed does
-	  not end '/bash' then your default is something else and you can run
+	  not end with '/bash' then your default is something else and you can run
 	  Bash by typing <code>bash</code>.
         </p>
       </article>
@@ -108,9 +108,9 @@ <h3>The Bash Shell</h3>
           install anything.
         </p>
         <p>
-          To see if your default shell is bash type <code>echo $SHELL</code> in
+          To see if your default shell is Bash type <code>echo $SHELL</code> in
           a terminal and press the enter/return key.  If the message printed does
-	  not end '/bash' then your default is something else and you can run
+	  not end with '/bash' then your default is something else and you can run
 	  Bash by typing <code>bash</code>.
         </p>
       </article>