Skip to content

Provide a fish shell toggle for swiftly one-liners #946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+85 −14
Open

Provide a fish shell toggle for swiftly one-liners #946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21894b2
Provide a fish shell toggle for swiftly one-liners
cmcgee1024 Mar 29, 2025
12e39f0
Make fish commands conditional on SWIFTLY_HOME_DIR
cmcgee1024 Mar 29, 2025
22d9a3e
Put protective quotes around the home directory expansion
cmcgee1024 Mar 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 34 additions & 7 deletions _includes/install/_linux_platforms_tabs.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,44 @@
<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 = 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:-~/.local/share/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>
Expand Down
20 changes: 20 additions & 0 deletions assets/stylesheets/elements/_grid.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
38 changes: 31 additions & 7 deletions install/macos/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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 += "set -q SWIFTLY_HOME_DIR && . \"$SWIFTLY_HOME_DIR/env.fish\" || . ~/.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
Expand Down