From e23f2a84a6cddc3e57ffd9465040287dd4bd8d20 Mon Sep 17 00:00:00 2001
From: Julian Ospald <hasufell@posteo.de>
Date: Thu, 15 Aug 2019 11:17:38 +0800
Subject: [PATCH] www: specify that the installation command should be run as
normal user
Fixes #112
---
www/ghcup.css | 6 ++++++
www/index.html | 24 ++++++++++++------------
2 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/www/ghcup.css b/www/ghcup.css
index a2737f6..c995699 100644
--- a/www/ghcup.css
+++ b/www/ghcup.css
@@ -119,6 +119,7 @@ hr {
margin-right: auto;
padding-top: 1rem;
padding-bottom: 1rem;
+ padding-right: 1rem;
text-align: center;
border-radius: 3px;
box-shadow: inset 0px 0px 20px 0px #333333;
@@ -160,3 +161,8 @@ hr {
margin-right: auto;
padding: 1em;
}
+
+.ghcup-command:before {
+ color: #999;
+ content: " $ ";
+}
diff --git a/www/index.html b/www/index.html
index 71cadc5..8b92fe9 100644
--- a/www/index.html
+++ b/www/index.html
@@ -25,20 +25,20 @@
</p>
<div id="platform-instructions-linux" class="instructions" style="display: none;">
- <p>Run the following in your terminal, then follow the onscreen instructions.</p>
- <pre>curl https://get-ghcup.haskell.org -sSf | sh</pre>
+ <p>Run the following in your terminal (as a user other than root), then follow the onscreen instructions.</p>
+ <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>
</div>
<div id="platform-instructions-mac" class="instructions" style="display: none;">
- <p>Run the following in your terminal, then follow the onscreen instructions.</p>
- <pre>curl https://get-ghcup.haskell.org -sSf | sh</pre>
+ <p>Run the following in your terminal (as a user other than root), then follow the onscreen instructions.</p>
+ <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>
</div>
<div id="platform-instructions-freebsd" class="instructions" style="display: none;">
- <p>Run the following in your terminal, then follow the onscreen instructions.</p>
- <pre>curl https://get-ghcup.haskell.org -sSf | sh</pre>
+ <p>Run the following in your terminal (as a user other than root), then follow the onscreen instructions.</p>
+ <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>
</div>
@@ -77,8 +77,8 @@
<!-- duplicate the default cross-platform instructions -->
<div>
- <p>If you are running Linux, macOS or FreeBSD,<br/>run the following in your terminal, then follow the onscreen instructions.</p>
- <pre>curl https://get-ghcup.haskell.org -sSf | sh</pre>
+ <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><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>
</div>
@@ -96,8 +96,8 @@
<div id="platform-instructions-default" class="instructions">
<div>
<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>
- <pre>curl https://get-ghcup.haskell.org -sSf | sh</pre>
+ in your terminal (as a user other than root), then follow the onscreen instructions.</p>
+ <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>
</div>
@@ -141,8 +141,8 @@
<div id="platform-instructions-default" class="instructions">
<div>
<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>
- <pre>curl https://get-ghcup.haskell.org -sSf | sh</pre>
+ in your terminal (as a user other than root), then follow the onscreen instructions.</p>
+ <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>
</div>
--
GitLab