Skip to content
This repository was archived by the owner on Sep 30, 2020. It is now read-only.

Update rustup platform detection #676

Merged
merged 1 commit into from
Jan 18, 2017
Merged
Changes from all commits
Commits
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
19 changes: 10 additions & 9 deletions _includes/rustup.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
var platform_override = null;

function android_or_unix() {
return (navigator.appVersion.indexOf("Android") != -1) ? "android" : "unix";
}

function detect_platform() {
"use strict";

Expand All @@ -10,24 +14,21 @@ function detect_platform() {
var os = "unknown";

if (navigator.platform == "Linux x86_64") {os = "unix";}
if (navigator.platform == "Linux i686") {os = "unix";}
if (navigator.platform == "Linux i686") {os = android_or_unix();}
if (navigator.platform == "Linux i686 on x86_64") {os = "unix";}
if (navigator.platform == "Linux aarch64") {os = "unix";}
if (navigator.platform == "Linux armv6l") {os = "unix";}
if (navigator.platform == "Linux armv7l") {os = "unix";}
if (navigator.platform == "Linux aarch64") {os = android_or_unix();}
if (navigator.platform == "Linux armv6l") {os = android_or_unix();}
if (navigator.platform == "Linux armv7l") {os = android_or_unix();}
if (navigator.platform == "Linux ppc64") {os = "unix";}
if (navigator.platform == "Linux mips") {os = "unix";}
if (navigator.platform == "Linux mips64") {os = "unix";}
if (navigator.platform == "Mac") {os = "unix";}
if (navigator.platform == "Win32") {os = "win";}
if (navigator.platform == "FreeBSD x86_64") {os = "unix";}
if (navigator.platform == "FreeBSD amd64") {os = "unix";}
if (navigator.platform == "NetBSD x86_64") {os = "unix";}
if (navigator.platform == "NetBSD amd64") {os = "unix";}

if (navigator.platform == "Linux armv7l"
&& navigator.appVersion.indexOf("Android") != -1 ) {
os = "android";
}

// I wish I knew by now, but I don't. Try harder.
if (os == "unknown") {
if (navigator.appVersion.indexOf("Win")!=-1) {os = "win";}
Expand Down