Skip to content

Commit 0d414ef

Browse files
authored
Merge pull request #551 from brson/nodisclaim
Revert "www: Add a disclaimer about curl | sh"
2 parents 2ae4713 + cb79e50 commit 0d414ef

File tree

2 files changed

+6
-24
lines changed

2 files changed

+6
-24
lines changed

www/index.html

+4-16
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,14 @@
2424
</p>
2525

2626
<div id="platform-instructions-unix" class="instructions" style="display: none;">
27-
<p>Run the following in your terminal<sup></sup>, then follow the onscreen instructions.</p>
27+
<p>Run the following in your terminal, then follow the onscreen instructions.</p>
2828
<pre>curl https://sh.rustup.rs -sSf | sh</pre>
29-
<p id="sh-disclaimer">
30-
<sup></sup>
31-
<a href="https://sandstorm.io/news/2015-09-24-is-curl-bash-insecure-pgp-verified-install">
32-
On the security of <code>curl | sh</code>
33-
</a>
34-
</p>
3529
</div>
3630

3731
<div id="platform-instructions-win" class="instructions" style="display: none;">
3832
<p>
3933
Download and run
40-
<a class="rustup-link" href="https://win.rustup.rs">rustup&#x2011;init.exe</a>
34+
<a href="https://win.rustup.rs">rustup&#x2011;init.exe</a>
4135
then follow the onscreen instructions.
4236
</p>
4337
</div>
@@ -73,22 +67,16 @@
7367

7468
<div id="platform-instructions-default" class="instructions">
7569
<div>
76-
<p>If you are running Unix,<br/>run the following in your terminal<sup></sup>, then follow the onscreen instructions.</p>
70+
<p>If you are running Unix,<br/>run the following in your terminal, then follow the onscreen instructions.</p>
7771
<pre>curl https://sh.rustup.rs -sSf | sh</pre>
78-
<p id="sh-disclaimer">
79-
<sup></sup>
80-
<a href="https://sandstorm.io/news/2015-09-24-is-curl-bash-insecure-pgp-verified-install">
81-
On the security of <code>curl | sh</code>
82-
</a>
83-
</p>
8472
</div>
8573

8674
<hr/>
8775

8876
<div>
8977
<p>
9078
If you are running Windows,<br/>download and run
91-
<a class="rustup-link" href="https://win.rustup.rs">rustup&#x2011;init.exe</a>
79+
<a href="https://win.rustup.rs">rustup&#x2011;init.exe</a>
9280
then follow the onscreen instructions.
9381
</p>
9482
</div>

www/rustup.css

+2-8
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ hr {
115115
box-shadow: inset 0px 0px 20px 0px #333333;
116116
}
117117

118-
#platform-instructions-win .rustup-link,
119-
#platform-instructions-default .rustup-link {
118+
#platform-instructions-win a,
119+
#platform-instructions-default a {
120120
display: block;
121121
padding-top: 0.4rem;
122122
padding-bottom: 0.6rem;
@@ -130,12 +130,6 @@ hr {
130130
line-height: 2rem;
131131
}
132132

133-
#sh-disclaimer {
134-
font-size: 14px;
135-
padding-top: 20px;
136-
padding-bottom: 10px;
137-
}
138-
139133
#warning {
140134
color: red;
141135
font-weight: 500;

0 commit comments

Comments
 (0)