Skip to content

Commit 33edfab

Browse files
committed
Adjust the one-liners and installation pages for macOS and Linux
1 parent 575c971 commit 33edfab

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

_includes/install/_linux_platforms_tabs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<h4>Run this in a terminal:</h4>
99
<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-{{ site.data.builds.swiftly_release.version }}-$(uname -m).tar.gz &amp;&amp; \
1010
tar zxf swiftly-{{ site.data.builds.swiftly_release.version }}-$(uname -m).tar.gz &amp;&amp; \
11-
SWIFTLY_HOME_DIR=~/.swiftly SWIFTLY_BIN_DIR=~/.swiftly/bin ./swiftly init --quiet-shell-followup &amp;&amp; \
12-
. ~/.swiftly/env.sh &amp;&amp; \
11+
./swiftly init --quiet-shell-followup &amp;&amp; \
12+
. ~/.local/share/swiftly/env.sh &amp;&amp; \
1313
hash -r
1414
</code></pre></div></div>
1515
<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>

install/linux/swiftly/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ tar -zxf swiftly-{{ site.data.builds.swiftly_release.version }}-$(uname -m).tar.
2626
Run the following command in your terminal, to configure swiftly for your account, and automatically download the latest swift toolchain.
2727

2828
```
29-
SWIFTLY_HOME_DIR=~/.swiftly SWIFTLY_BIN_DIR=~/.swiftly/bin ./swiftly init
29+
./swiftly init
3030
```
3131

32-
Note: You can adjust the SWIFTLY_* environment variables to customize your install location, or remove them entirely to get the Linux standard location.
32+
Note: You can set the SWIFTLY_HOME_DIR and SWIFTLY_BIN_DIR environment variables to customize your install location.
3333

3434
Your current shell may need some additional steps to update your session. Follow the guidance at the end of the installation for a smooth install experience, such as sourcing the environment file, and rehashing your shell's PATH.
3535

install/macos/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ title: Install Swift
1515
<h4>Run this in a terminal:</h4>
1616
<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-{{ site.data.builds.swiftly_release.version }}.pkg &amp;&amp; \
1717
installer -pkg swiftly-{{ site.data.builds.swiftly_release.version }}.pkg -target CurrentUserHomeDirectory &amp;&amp; \
18-
SWIFTLY_HOME_DIR=~/.swiftly SWIFTLY_BIN_DIR=~/.swiftly/bin ~/.swiftly/bin/swiftly init --quiet-shell-followup &amp;&amp; \
18+
~/.swiftly/bin/swiftly init --quiet-shell-followup &amp;&amp; \
1919
. ~/.swiftly/env.sh &amp;&amp; \
2020
hash -r
2121
</code></pre></div></div>

install/macos/swiftly/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ installer -pkg swiftly-{{ site.data.builds.swiftly_release.version }}.pkg -targe
1414
Run the following command in your terminal, to configure swiftly for your account, and automatically download the latest swift toolchain.
1515

1616
```
17-
SWIFTLY_HOME_DIR=~/.swiftly SWIFTLY_BIN_DIR=~/.swiftly/bin ~/.swiftly/bin/swiftly init
17+
~/.swiftly/bin/swiftly init
1818
```
1919

20-
Note: You can change the SWIFTLY_* environment variables to customize the install location, or remove them entirely to get the macOS standard location.
20+
Note: You can set the SWIFTLY_HOME_DIR and SWIFTLY_BIN_DIR environment variables to customize the install location.
2121

2222
<div class="warning" markdown="1">
2323
Your current shell may need some additional steps to update your session. Follow the guidance at the end of the installation for a smooth install experience, such as sourcing the environment file, and rehashing your shell's PATH.

0 commit comments

Comments
 (0)