From 21894b2c6094507e33318ad538fcd77adfa6ee97 Mon Sep 17 00:00:00 2001
From: Chris McGee <christie_mcgee@apple.com>
Date: Sat, 29 Mar 2025 08:46:14 -0400
Subject: [PATCH 1/3] Provide a fish shell toggle for swiftly one-liners

Make code blocks wrap on limited horizontal space
---
 _includes/install/_linux_platforms_tabs.md | 39 ++++++++++++++++++----
 assets/stylesheets/elements/_grid.scss     | 20 +++++++++++
 install/macos/index.md                     | 38 +++++++++++++++++----
 3 files changed, 83 insertions(+), 14 deletions(-)

diff --git a/_includes/install/_linux_platforms_tabs.md b/_includes/install/_linux_platforms_tabs.md
index fd8972220..4e989fce9 100644
--- a/_includes/install/_linux_platforms_tabs.md
+++ b/_includes/install/_linux_platforms_tabs.md
@@ -5,17 +5,42 @@
   <p class="description">
     The Swiftly installer manages Swift and its dependencies. It supports switching between different versions and downloading updates.
   </p>
-  <h4>Run this in a terminal:</h4>
-  <div class="language-plaintext highlighter-rouge"><div class="highlight"><button>Copy</button><pre class="highlight"><code>curl -O https://download.swift.org/swiftly/linux/swiftly-$(uname -m).tar.gz &amp;&amp; \
-tar zxf swiftly-$(uname -m).tar.gz &amp;&amp; \
-./swiftly init --quiet-shell-followup &amp;&amp; \
-. ~/.local/share/swiftly/env.sh &amp;&amp; \
-hash -r
-</code></pre></div></div>
+  <div class="shellcode-intro">Run this in a terminal:<button id="shell" class="toggle">fish</button></div>
+  <div class="language-plaintext highlighter-rouge"><div class="highlight"><button>Copy</button><pre class="highlight"><code id="shellcode" style="white-space: initial;"></code></pre></div></div>
   <h4>License: <a href="https://raw.githubusercontent.com/swiftlang/swiftly/refs/heads/main/LICENSE.txt">Apache-2.0</a> | PGP: <a href="https://download.swift.org/swiftly/linux/swiftly-0.4.0-dev-x86_64.tar.gz.sig">Signature</a></h4>
   <a href="/install/linux/swiftly" class="cta-secondary">Instructions</a>
 </li>
 </ul>
+
+<script>
+var shell = "";
+var shellToggle = document.getElementById("shell");
+var code = document.getElementById("shellcode");
+
+function setShell() {
+  code.innerText = "curl -O https://download.swift.org/swiftly/linux/swiftly-$(uname -m).tar.gz && \\\n"
+  code.innerText += "tar zxf swiftly-$(uname -m).tar.gz && \\\n"
+  code.innerText += "./swiftly init --quiet-shell-followup && \\\n"
+
+  if (shell == "sh") {
+    shell = "fish";
+    code.innerText += ". ~/.swiftly/env.fish"
+    shellToggle.innerText = "sh";
+  } else {
+    shell = "sh";
+    code.innerText += ". ${SWIFTLY_HOME_DIR:-~/.swiftly}/env.sh && \\\n"
+    code.innerText += "hash -r"
+    shellToggle.innerText = "fish";
+  }
+}
+
+setShell();
+
+shellToggle.addEventListener("mousedown", function() {
+  setShell();
+});
+</script>
+
 <ul class="grid-level-0 grid-layout-1-column">
 <li class="grid-level-1">
     <h3>Container</h3>
diff --git a/assets/stylesheets/elements/_grid.scss b/assets/stylesheets/elements/_grid.scss
index 45506c9ee..9ad5c2566 100644
--- a/assets/stylesheets/elements/_grid.scss
+++ b/assets/stylesheets/elements/_grid.scss
@@ -131,3 +131,23 @@ div.highlight {
   margin: 0;
   display: none;
 }
+
+button.toggle {
+  width: fit-content;
+  float: right;
+  margin-right: 1.1rem;
+  background-color: var(--color-fill-tertiary);
+  border: 1px solid var(--color-fill-quaternary);
+  border-radius: var(--border-radius);
+
+  &:hover {
+    color: var(--color-link);
+    background-color: var(--color-fill-quaternary);
+  }
+}
+
+.shellcode-intro {
+  font-size: .8rem;
+  color: var(--color-secondary-label);
+  padding-top: 0.8rem;
+}
diff --git a/install/macos/index.md b/install/macos/index.md
index 393ff542d..e3cee1151 100644
--- a/install/macos/index.md
+++ b/install/macos/index.md
@@ -12,13 +12,8 @@ title: Install Swift
   <p class="description">
     To download toolchains from Swift.org, use the Swiftly toolchain installer. Swift.org toolchains include experimental features like Embedded Swift and support for WebAssembly.
   </p>
-  <h4>Run this in a terminal:</h4>
-  <div class="language-plaintext highlighter-rouge"><div class="highlight"><button>Copy</button><pre class="highlight"><code>curl -O https://download.swift.org/swiftly/darwin/swiftly.pkg &amp;&amp; \
-installer -pkg swiftly.pkg -target CurrentUserHomeDirectory &amp;&amp; \
-~/.swiftly/bin/swiftly init --quiet-shell-followup &amp;&amp; \
-. ~/.swiftly/env.sh &amp;&amp; \
-hash -r
-</code></pre></div></div>
+  <div class="shellcode-intro">Run this in a terminal:<button id="shell" class="toggle"></button></div>
+  <div class="language-plaintext highlighter-rouge"><div class="highlight"><button>Copy</button><pre style="white-space: initial;" class="highlight"><code id="shellcode"></code></pre></div></div>
   <h4>License: <a href="https://raw.githubusercontent.com/swiftlang/swiftly/refs/heads/main/LICENSE.txt">Apache-2.0</a></h4>
   <a href="/install/macos/swiftly" class="cta-secondary">Instructions</a>
   </li>
@@ -32,6 +27,35 @@ hash -r
     <a href="https://developer.apple.com/xcode/" class="cta-secondary external">Install Xcode</a>
   </li>
 </ul>
+<script>
+
+var shell = "";
+var shellToggle = document.getElementById("shell");
+var code = document.getElementById("shellcode");
+
+function setShell() {
+  code.innerText = "curl -O https://download.swift.org/swiftly/darwin/swiftly.pkg && \\\n"
+  code.innerText += "installer -pkg swiftly.pkg -target CurrentUserHomeDirectory && \\\n"
+  code.innerText += "~/.swiftly/bin/swiftly init --quiet-shell-followup && \\\n"
+
+  if (shell == "sh") {
+    shell = "fish";
+    code.innerText += ". ~/.swiftly/env.fish"
+    shellToggle.innerText = "sh";
+  } else {
+    shell = "sh";
+    code.innerText += ". ${SWIFTLY_HOME_DIR:-~/.swiftly}/env.sh && \\\n"
+    code.innerText += "hash -r"
+    shellToggle.innerText = "fish";
+  }
+}
+
+setShell();
+
+shellToggle.addEventListener("mousedown", function() {
+  setShell();
+});
+</script>
 
 
 ## Other Install Options

From 12e39f006c4ed19021e2a25512737334fa21f86b Mon Sep 17 00:00:00 2001
From: Chris McGee <christie_mcgee@apple.com>
Date: Sat, 29 Mar 2025 09:16:16 -0400
Subject: [PATCH 2/3] Make fish commands conditional on SWIFTLY_HOME_DIR

Correct the default Linux swiftly home paths
---
 _includes/install/_linux_platforms_tabs.md | 6 ++++--
 install/macos/index.md                     | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/_includes/install/_linux_platforms_tabs.md b/_includes/install/_linux_platforms_tabs.md
index 4e989fce9..bb86824c6 100644
--- a/_includes/install/_linux_platforms_tabs.md
+++ b/_includes/install/_linux_platforms_tabs.md
@@ -24,11 +24,13 @@ function setShell() {
 
   if (shell == "sh") {
     shell = "fish";
-    code.innerText += ". ~/.swiftly/env.fish"
+    code.innerText = code.innerText.replace("$(", "(") // Subshells are invoked differently in fish
+    code.innerText = code.innerText.replace("$(", "(")
+    code.innerText += "set -q SWIFTLY_HOME_DIR && . \"$SWIFTLY_HOME_DIR/env.fish\" || . ~/.local/share/swiftly/env.fish"
     shellToggle.innerText = "sh";
   } else {
     shell = "sh";
-    code.innerText += ". ${SWIFTLY_HOME_DIR:-~/.swiftly}/env.sh && \\\n"
+    code.innerText += ". ${SWIFTLY_HOME_DIR:-~/.local/share/swiftly}/env.sh && \\\n"
     code.innerText += "hash -r"
     shellToggle.innerText = "fish";
   }
diff --git a/install/macos/index.md b/install/macos/index.md
index e3cee1151..ef5c49b49 100644
--- a/install/macos/index.md
+++ b/install/macos/index.md
@@ -40,7 +40,7 @@ function setShell() {
 
   if (shell == "sh") {
     shell = "fish";
-    code.innerText += ". ~/.swiftly/env.fish"
+    code.innerText += "set -q SWIFTLY_HOME_DIR && . \"$SWIFTLY_HOME_DIR/env.fish\" || . ~/.swiftly/env.fish"
     shellToggle.innerText = "sh";
   } else {
     shell = "sh";

From 22d9a3e7e98243ed220861a50481936bb69a9750 Mon Sep 17 00:00:00 2001
From: Chris McGee <christie_mcgee@apple.com>
Date: Sat, 29 Mar 2025 14:03:16 -0400
Subject: [PATCH 3/3] Put protective quotes around the home directory expansion

---
 _includes/install/_linux_platforms_tabs.md | 2 +-
 install/macos/index.md                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/_includes/install/_linux_platforms_tabs.md b/_includes/install/_linux_platforms_tabs.md
index bb86824c6..c5d4e9768 100644
--- a/_includes/install/_linux_platforms_tabs.md
+++ b/_includes/install/_linux_platforms_tabs.md
@@ -30,7 +30,7 @@ function setShell() {
     shellToggle.innerText = "sh";
   } else {
     shell = "sh";
-    code.innerText += ". ${SWIFTLY_HOME_DIR:-~/.local/share/swiftly}/env.sh && \\\n"
+    code.innerText += ". \"${SWIFTLY_HOME_DIR:-~/.local/share/swiftly}/env.sh\" && \\\n"
     code.innerText += "hash -r"
     shellToggle.innerText = "fish";
   }
diff --git a/install/macos/index.md b/install/macos/index.md
index ef5c49b49..79643d35f 100644
--- a/install/macos/index.md
+++ b/install/macos/index.md
@@ -44,7 +44,7 @@ function setShell() {
     shellToggle.innerText = "sh";
   } else {
     shell = "sh";
-    code.innerText += ". ${SWIFTLY_HOME_DIR:-~/.swiftly}/env.sh && \\\n"
+    code.innerText += ". \"${SWIFTLY_HOME_DIR:-~/.swiftly}/env.sh\" && \\\n"
     code.innerText += "hash -r"
     shellToggle.innerText = "fish";
   }