Merge branch 'no-root'
This commit is contained in:
commit
10d1d2cc58
@ -119,6 +119,7 @@ hr {
|
|||||||
margin-right: auto;
|
margin-right: auto;
|
||||||
padding-top: 1rem;
|
padding-top: 1rem;
|
||||||
padding-bottom: 1rem;
|
padding-bottom: 1rem;
|
||||||
|
padding-right: 1rem;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
box-shadow: inset 0px 0px 20px 0px #333333;
|
box-shadow: inset 0px 0px 20px 0px #333333;
|
||||||
@ -160,3 +161,8 @@ hr {
|
|||||||
margin-right: auto;
|
margin-right: auto;
|
||||||
padding: 1em;
|
padding: 1em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.ghcup-command:before {
|
||||||
|
color: #999;
|
||||||
|
content: " $ ";
|
||||||
|
}
|
||||||
|
@ -25,20 +25,20 @@
|
|||||||
</p>
|
</p>
|
||||||
|
|
||||||
<div id="platform-instructions-linux" class="instructions" style="display: none;">
|
<div id="platform-instructions-linux" class="instructions" style="display: none;">
|
||||||
<p>Run the following in your terminal, then follow the onscreen instructions.</p>
|
<p>Run the following in your terminal (as a user other than root), then follow the onscreen instructions.</p>
|
||||||
<pre>curl https://get-ghcup.haskell.org -sSf | sh</pre>
|
<pre><span class='ghcup-command'>curl https://get-ghcup.haskell.org -sSf | sh</span></pre>
|
||||||
<p class="other-help">If you don't like curl | sh, see <a href="https://gitlab.haskell.org/haskell/ghcup/blob/master/README.md#manual-install">other installation methods</a>.<br/>You appear to be running Linux. If not, <a class="default-platform-button" href="#">display all supported installers</a>.</p>
|
<p class="other-help">If you don't like curl | sh, see <a href="https://gitlab.haskell.org/haskell/ghcup/blob/master/README.md#manual-install">other installation methods</a>.<br/>You appear to be running Linux. If not, <a class="default-platform-button" href="#">display all supported installers</a>.</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="platform-instructions-mac" class="instructions" style="display: none;">
|
<div id="platform-instructions-mac" class="instructions" style="display: none;">
|
||||||
<p>Run the following in your terminal, then follow the onscreen instructions.</p>
|
<p>Run the following in your terminal (as a user other than root), then follow the onscreen instructions.</p>
|
||||||
<pre>curl https://get-ghcup.haskell.org -sSf | sh</pre>
|
<pre><span class='ghcup-command'>curl https://get-ghcup.haskell.org -sSf | sh</span></pre>
|
||||||
<p class="other-help">If you don't like curl | sh, see <a href="https://gitlab.haskell.org/haskell/ghcup/blob/master/README.md#manual-install">other installation methods</a>.<br/>You appear to be running macOS. If not, <a class="default-platform-button" href="#">display all supported installers</a>.</p>
|
<p class="other-help">If you don't like curl | sh, see <a href="https://gitlab.haskell.org/haskell/ghcup/blob/master/README.md#manual-install">other installation methods</a>.<br/>You appear to be running macOS. If not, <a class="default-platform-button" href="#">display all supported installers</a>.</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="platform-instructions-freebsd" class="instructions" style="display: none;">
|
<div id="platform-instructions-freebsd" class="instructions" style="display: none;">
|
||||||
<p>Run the following in your terminal, then follow the onscreen instructions.</p>
|
<p>Run the following in your terminal (as a user other than root), then follow the onscreen instructions.</p>
|
||||||
<pre>curl https://get-ghcup.haskell.org -sSf | sh</pre>
|
<pre><span class='ghcup-command'>curl https://get-ghcup.haskell.org -sSf | sh</span></pre>
|
||||||
<p class="other-help">If you don't like curl | sh, see <a href="https://gitlab.haskell.org/haskell/ghcup/blob/master/README.md#manual-install">other installation methods</a>.<br/>You appear to be running FreeBSD. If not, <a class="default-platform-button" href="#">display all supported installers</a>.</p>
|
<p class="other-help">If you don't like curl | sh, see <a href="https://gitlab.haskell.org/haskell/ghcup/blob/master/README.md#manual-install">other installation methods</a>.<br/>You appear to be running FreeBSD. If not, <a class="default-platform-button" href="#">display all supported installers</a>.</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -77,8 +77,8 @@
|
|||||||
|
|
||||||
<!-- duplicate the default cross-platform instructions -->
|
<!-- duplicate the default cross-platform instructions -->
|
||||||
<div>
|
<div>
|
||||||
<p>If you are running Linux, macOS or FreeBSD,<br/>run the following in your terminal, then follow the onscreen instructions.</p>
|
<p>If you are running Linux, macOS or FreeBSD,<br/>run the following in your terminal (as a user other than root), then follow the onscreen instructions.</p>
|
||||||
<pre>curl https://get-ghcup.haskell.org -sSf | sh</pre>
|
<pre><span class='ghcup-command'>curl https://get-ghcup.haskell.org -sSf | sh</span></pre>
|
||||||
<p class="other-help">If you don't like curl | sh, see <a href="https://gitlab.haskell.org/haskell/ghcup/blob/master/README.md#manual-install">other installation methods</a>.</p>
|
<p class="other-help">If you don't like curl | sh, see <a href="https://gitlab.haskell.org/haskell/ghcup/blob/master/README.md#manual-install">other installation methods</a>.</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -96,8 +96,8 @@
|
|||||||
<div id="platform-instructions-default" class="instructions">
|
<div id="platform-instructions-default" class="instructions">
|
||||||
<div>
|
<div>
|
||||||
<p>To install Haskell, if you are running Linux, macOS or FreeBSD,<br/>run the following
|
<p>To install Haskell, if you are running Linux, macOS or FreeBSD,<br/>run the following
|
||||||
in your terminal, then follow the onscreen instructions.</p>
|
in your terminal (as a user other than root), then follow the onscreen instructions.</p>
|
||||||
<pre>curl https://get-ghcup.haskell.org -sSf | sh</pre>
|
<pre><span class='ghcup-command'>curl https://get-ghcup.haskell.org -sSf | sh</span></pre>
|
||||||
<p class="other-help">If you don't like curl | sh, see <a href="https://gitlab.haskell.org/haskell/ghcup/blob/master/README.md#manual-install">other installation methods</a>.</p>
|
<p class="other-help">If you don't like curl | sh, see <a href="https://gitlab.haskell.org/haskell/ghcup/blob/master/README.md#manual-install">other installation methods</a>.</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -141,8 +141,8 @@
|
|||||||
<div id="platform-instructions-default" class="instructions">
|
<div id="platform-instructions-default" class="instructions">
|
||||||
<div>
|
<div>
|
||||||
<p>To install Haskell, if you are running Linux, macOS or FreeBSD,<br/>run the following
|
<p>To install Haskell, if you are running Linux, macOS or FreeBSD,<br/>run the following
|
||||||
in your terminal, then follow the onscreen instructions.</p>
|
in your terminal (as a user other than root), then follow the onscreen instructions.</p>
|
||||||
<pre>curl https://get-ghcup.haskell.org -sSf | sh</pre>
|
<pre><span class='ghcup-command'>curl https://get-ghcup.haskell.org -sSf | sh</span></pre>
|
||||||
<p class="other-help">If you don't like curl | sh, see <a href="https://gitlab.haskell.org/haskell/ghcup/blob/master/README.md#manual-install">other installation methods</a>.</p>
|
<p class="other-help">If you don't like curl | sh, see <a href="https://gitlab.haskell.org/haskell/ghcup/blob/master/README.md#manual-install">other installation methods</a>.</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user