Skip to content

Commit 33d4b8c

Browse files
committed
Panel: Fix exporting build backup for arm64 builds
1 parent 9628185 commit 33d4b8c

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

compat.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,7 @@ progress[value]::-webkit-progress-value {
960960
padding: 5px;
961961
margin-left: 10px;
962962
border-radius: 6px;
963-
width: 140px;
963+
width: 160px;
964964
text-align: center;
965965
display: inline-block
966966
}

includes/inc.panel.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -941,13 +941,13 @@ function export_build_backup() : void
941941
$select->add_option(new HTMLOption("win", "Windows (x64)"));
942942
$select->add_option(new HTMLOption("linux", "Linux (x64)"));
943943
$select->add_option(new HTMLOption("mac", "macOS (x64)"));
944-
$select->add_option(new HTMLOption("linux_arm64", "Linux (arm64)"));
945-
$select->add_option(new HTMLOption("mac_arm64", "macOS (arm64)"));
944+
$select->add_option(new HTMLOption("linux-arm64", "Linux (arm64)"));
945+
$select->add_option(new HTMLOption("mac-arm64", "macOS (arm64)"));
946946
$form->add_select($select);
947947
$form->add_button(new HTMLButton("backupRequest", "submit", "Backup Request"));
948948
$form->print();
949949

950-
if (!isset($_POST['os']) || !is_string($_POST['os']) || !in_array($_POST['os'], array("win", "linux", "mac", "linux_arm64", "mac_arm64")))
950+
if (!isset($_POST['os']) || !is_string($_POST['os']) || !in_array($_POST['os'], array("win", "linux", "mac", "linux-arm64", "mac-arm64")))
951951
{
952952
return;
953953
}
@@ -962,8 +962,10 @@ function export_build_backup() : void
962962
$s_os = mysqli_real_escape_string($db, $_POST['os']);
963963
$s_url_prefix = mysqli_escape_string($db, "https://github.com/RPCS3/rpcs3-binaries-{$_POST['os']}/releases/download/build-");
964964

965-
$q_builds = mysqli_query($db, "SELECT CONCAT('{$s_url_prefix}', `commit`, '/', `filename_{$s_os}`) AS `url`
966-
FROM `builds` WHERE `filename_{$s_os}` IS NOT NULL AND `filename_{$s_os}` <> ''
965+
$s_rowname = mysqli_real_escape_string($db, "filename_".str_replace('-', '_', $_POST['os']));
966+
967+
$q_builds = mysqli_query($db, "SELECT CONCAT('{$s_url_prefix}', `commit`, '/', `{$s_rowname}`) AS `url`
968+
FROM `builds` WHERE `{$s_rowname}` IS NOT NULL AND `{$s_rowname}` <> ''
967969
ORDER BY `merge_datetime` DESC;");
968970

969971
mysqli_close($db);

0 commit comments

Comments
 (0)