Skip to content

Fix downloads link #172

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

Open
JoeyShapiro wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Fix downloads link #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ed92f48
use releases file
JoeyShapiro Jan 18, 2026
555c5cf
have downloads use common code
JoeyShapiro Jan 18, 2026
c0d85ee
add more common code
JoeyShapiro Jan 18, 2026
dbed08a
match indenting of other files
JoeyShapiro Jan 18, 2026
94f4cca
fix formatting
JoeyShapiro Jan 18, 2026
8c7b981
use files from releases.js
JoeyShapiro Jan 18, 2026
8ff7aca
cleanup logic
JoeyShapiro Jan 18, 2026
b775939
handle linux arm64
JoeyShapiro Jan 18, 2026
53c8ba7
remove nullish check
JoeyShapiro Jan 18, 2026
9518d7a
add arch to names
JoeyShapiro Jan 18, 2026
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: 19 additions & 0 deletions assets/js/fileinfo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
var fileinfo = {};

function setSnapshotFileInfo(key, name, size, url) {
fileinfo[key + "_NAME"] = name;
fileinfo[key + "_SIZE"] = size;
fileinfo[key + "_URL"] = url;
fileinfo[key + "_ASC_URL"] = url + ".asc";
fileinfo[key + "_SHA256_URL"] = url + ".sha256";
fileinfo[key + "_SHA512_URL"] = url + ".sha512";
}
jQuery(document).ready(function () {
for (var fileid in fileinfo) {
if (fileid.indexOf("_URL") >= 0) {
$("a[id=" + fileid + "]").attr('href', fileinfo[fileid]);
} else {
$("#" + fileid).text(fileinfo[fileid]);
}
}
});
58 changes: 29 additions & 29 deletions assets/js/home.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,41 +3,41 @@ $(document).ready(function() {
var w = window.navigator.platform;
var bits = 32;
fi = function(s) {
return window.navigator.userAgent.indexOf(s) > -1;
return window.navigator.userAgent.includes(s);
};
if (fi('x86_64') || fi('x86-64') || fi('Win64') || fi('x64;') || fi('amd64') || fi('AMD64') || fi('WOW64') || fi('x64_64') || w === 'MacIntel' || w === 'Linux x86_64') {
bits = 64;
}

var OSName="Unknown OS";
if (navigator.appVersion.indexOf("Win")!=-1) {
OSName="Windows";
if (bits == 64) {
DLName = fileinfo['WIN64_RELEASE_INSTALLER_NAME'];
downloadLink = fileinfo['WIN64_RELEASE_INSTALLER_URL'];
}
else {
DLName = fileinfo['WIN32_RELEASE_INSTALLER_NAME'];
downloadLink = fileinfo['WIN32_RELEASE_INSTALLER_URL'];
}
}
else if (navigator.appVersion.indexOf("Mac")!=-1) {
OSName="Mac OS X";
DLName = fileinfo['MAC_RELEASE_NAME'];
downloadLink = fileinfo['MAC_RELEASE_URL'];
}
else if (navigator.appVersion.indexOf("X11")!=-1) {
OSName="Linux";
DLName = fileinfo['MAC_RELEASE_NAME'];
downloadLink = "downloads.html#linux";
}
else if (navigator.appVersion.indexOf("Linux")!=-1) {
OSName="Linux";
DLName = fileinfo['MAC_RELEASE_NAME'];
downloadLink = "downloads.html#linux";
}
var OSName = "Unsupported OS";
var DLName = "OpenSCAD 2021.01";
var downloadLink = "downloads.html";
if (fi("Win")) {
OSName=`Windows ${bits} bit`;
DLName = fileinfo[`WIN${bits}_RELEASE_INSTALLER_NAME`];
downloadLink = fileinfo[`WIN${bits}_RELEASE_INSTALLER_URL`];
}
else if (fi("Mac")) {
OSName = "Mac OS X Intel";
DLName = fileinfo['MAC_RELEASE_NAME'];
downloadLink = fileinfo['MAC_RELEASE_URL'];
}
else if (fi("X11") || fi("Linux")) {
OSName = "Linux";
downloadLink = "downloads.html#linux";

if (bits === 64) {
OSName += " 64 bit";
DLName = fileinfo['LIN64_RELEASE_NAME'];
downloadLink = fileinfo['LIN64_RELEASE_URL'];
} else if (fi("aarch64")) {
OSName += " ARM 64 bit";
DLName = fileinfo['ARM64_RELEASE_NAME'];
downloadLink = fileinfo['ARM64_RELEASE_URL'];
}
}

$("#home-download a#download-link").attr("href",downloadLink);
$("#home-download a#download-link").attr("href", downloadLink);
$("#home-download-link h4").text(DLName + " " + OSName);

var news, i;
Expand Down
23 changes: 1 addition & 22 deletions downloads.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,28 +28,7 @@
<script src="assets/js/waypoints-sticky.min.js"></script>

<script src="assets/js/header.js"></script>
<script>
var fileinfo = {};
</script>
<script>
function setSnapshotFileInfo(key, name, size, url) {
fileinfo[key + "_NAME"] = name;
fileinfo[key + "_SIZE"] = size;
fileinfo[key + "_URL"] = url;
fileinfo[key + "_ASC_URL"] = url + ".asc";
fileinfo[key + "_SHA256_URL"] = url + ".sha256";
fileinfo[key + "_SHA512_URL"] = url + ".sha512";
}
jQuery(document).ready(function(){
for (var fileid in fileinfo) {
if (fileid.indexOf("_URL") >= 0) {
$("a[id="+fileid+"]").attr('href',fileinfo[fileid]);
} else {
$("#"+fileid).text(fileinfo[fileid]);
}
}
});
</script>
<script src="assets/js/fileinfo.js"></script>
<script src="inc/releases.js"></script>
<script type="text/javascript" src="https://files.openscad.org/rc/.rc.js" onload="jQuery(function(){ jQuery('#rc').show(); jQuery('#nav-rc').show(); });"></script>
<script type="text/javascript" src="https://files.openscad.org/snapshots/.snapshots.js"></script>
Expand Down
7 changes: 2 additions & 5 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,8 @@
<script src="assets/js/waypoints.min.js"></script>
<script src="assets/js/waypoints-sticky.min.js"></script>

<script type="text/javascript">
var fileinfo = {};
</script>
<script src="inc/mac_release_links.js"></script>
<script src="inc/win_release_links.js"></script>
<script src="assets/js/fileinfo.js"></script>
<script src="inc/releases.js"></script>
<script src="assets/js/header.js"></script>
<script src="assets/js/home.js"></script>
<style>
Expand Down