Skip to content
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

download: Remove i686 Linux link #695

Merged
merged 1 commit into from
Feb 6, 2020
Merged

download: Remove i686 Linux link #695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion _data/binaries.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@ win64zip: "win64.zip"
win64exe: "win64-setup.exe"
macdmg: "-osx.dmg"
mactar: "osx64.tar.gz"
lin32: "i686-pc-linux-gnu.tar.gz"
lin64: "x86_64-linux-gnu.tar.gz"
riscv64: "riscv64-linux-gnu"
18 changes: 3 additions & 15 deletions _includes/templates/download.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% capture /dev/null %}<!-- suppress render of this part -->
<!-- Copyright 2013 - 2016 The Bitcoin.org Project.
Copyright 2017 - 2018 The BitcoinCore.org Project
Copyright 2017 - 2020 The BitcoinCore.org Project
This file is licensed under the MIT License (MIT) available on
http://opensource.org/licenses/MIT. -->
{% assign VERSION_SORTED_RELEASES = site.releases | sort: 'release' | reverse %}
Expand Down Expand Up @@ -41,9 +41,7 @@ <h2>{{ page.latestversion }} {{CURRENT_RELEASE}} <a type="application/rss+xml" h
<div>
<img src="/assets/images/os/med_linux.png" alt="linux">
<span>
<a href="{{ PATH_PREFIX }}/{{ FILE_PREFIX }}-{{ site.data.binaries.lin64 }}" id="downloadlin">Linux (tgz)</a>
<span><a href="{{ PATH_PREFIX }}/{{ FILE_PREFIX }}-{{ site.data.binaries.lin64 }}" class="dl" id="lin64">64 bit</a> -
<a href="{{ PATH_PREFIX }}/{{ FILE_PREFIX }}-{{ site.data.binaries.lin32 }}" class="dl" id="lin32">32 bit</a></span>
<a href="{{ PATH_PREFIX }}/{{ FILE_PREFIX }}-{{ site.data.binaries.lin64 }}" class="dl" id="lin64">Linux (tgz)</a>
</span>
</div>
</div>
Expand Down Expand Up @@ -251,21 +249,16 @@ <h2 style="text-align: center">{{page.build_reproduction}}</h2>
<script type="text/javascript">
var os = 'windows64';
if (navigator.userAgent.indexOf('Mac') != -1) var os = 'mac'
else if (navigator.userAgent.indexOf('Linux') != -1) {
var os='linux32';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we don't need this check for ARM, as the detection assumes Linux is always x86?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we assume that only x86 can run a browser 😬

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created an issue: #696

if (navigator.userAgent.indexOf('x86_64') != -1) var os = 'linux64';
}
else if (navigator.userAgent.indexOf('Linux') != -1) var os = 'linux64'
else if (navigator.userAgent.indexOf('WOW64') != -1 || navigator.userAgent.indexOf('Win64') != -1) var os='windows64';
var but = document.getElementById('downloadbutton');
var linkwinexe = document.getElementById('downloadwinexe');
var linkwinzip = document.getElementById('downloadwinzip');
var linklin = document.getElementById('downloadlin');
var hrefwin64exe = document.getElementById('win64exe').href;
var hrefwin64zip = document.getElementById('win64zip').href;
var hrefmacdmg = document.getElementById('macdmg').href;
var hrefmactar = document.getElementById('mactar').href;
var hreflin64 = document.getElementById('lin64').href;
var hreflin32 = document.getElementById('lin32').href;
switch (os) {
case 'windows64':
but.getElementsByTagName('IMG')[0].src = '/assets/images/os/but_windows.svg';
Expand All @@ -278,11 +271,6 @@ <h2 style="text-align: center">{{page.build_reproduction}}</h2>
but.href = hreflin64;
linklin.href = hreflin64;
break;
case 'linux32':
but.getElementsByTagName('IMG')[0].src = '/assets/images/os/but_linux.png';
but.href = hreflin32;
linklin.href = hreflin32;
break;
case 'mac':
but.getElementsByTagName('IMG')[0].src = '/assets/images/os/but_mac.svg';
but.href = hrefmacdmg;
Expand Down