diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a60d662..1e6ed35e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,9 @@ The following is a history of the changes made to this project. -## v2.8.5 *(in development)* +## v2.8.5 *(July 23rd, 2024)* -* The PiAware installation script now supports Ubuntu Noble Numbat. +* The PiAware installation script now supports Ubuntu Noble Numbat. *(unofficial fix)* * The installation of PiAware is no longer required when choosing to install dump1090-fa. * The dump1090-fa installation script now mimics the current dump1090-fa installation instructions. * All scripts excluding those related to the portal now utilize the new logging functions. diff --git a/README.md b/README.md index 22510b5e..355b876a 100644 --- a/README.md +++ b/README.md @@ -71,9 +71,11 @@ When setting up the portal you will have to choose between a lite or advanced in The project currently supports the following Linux distributions. * Armbian _(Bookworm, Jammy and Noble)_ -* Debian _(Bookworm and Bullseye)_ +* Debian _(Bookworm, Bullseye and Trixie)_ * DietPi _(Bookworm aand Bullseye)_ * Rasbperry PI OS _(Bookworm and Bullseye)_ * Ubuntu _(Jammy Jellyfish, Focal Fossa and Noble Numbat)_ -_Support is available via this repository through the use of the issue tracker or discussions._ \ No newline at end of file +_Support is available via this repository through the use of the issue tracker or discussions._ + +_At this time support for PiAware on distributions based on Debian Trixie and Ubuntu Noble Numbat employ an unofficial fix._ diff --git a/build/portal/html/classes/template.class.php b/build/portal/html/classes/template.class.php index 2f874490..9fb9c451 100644 --- a/build/portal/html/classes/template.class.php +++ b/build/portal/html/classes/template.class.php @@ -9,7 +9,7 @@ function display(&$pageData) { // Check if the portal is installed or needs upgraded. - $thisVersion = "2.8.4"; + $thisVersion = "2.8.5"; if (!file_exists($_SERVER['DOCUMENT_ROOT']."/classes/settings.class.php")) { header ("Location: /install/install.php"); diff --git a/build/portal/html/install/index.php b/build/portal/html/install/index.php index fdcb0bd8..6880ecf6 100644 --- a/build/portal/html/install/index.php +++ b/build/portal/html/install/index.php @@ -29,7 +29,7 @@ ///////////////////////////////////////////////////////////////////////////////////// // The most current stable release. - $thisVersion = "2.8.4"; + $thisVersion = "2.8.5"; // Begin the upgrade process if this release is newer than what is installed. if (file_exists($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR."classes".DIRECTORY_SEPARATOR."settings.class.php")) { diff --git a/build/portal/html/install/upgrade-v2.8.5.php b/build/portal/html/install/upgrade-v2.8.5.php new file mode 100644 index 00000000..a06b0181 --- /dev/null +++ b/build/portal/html/install/upgrade-v2.8.5.php @@ -0,0 +1,68 @@ +updateSetting("version", "2.8.5"); + $common->updateSetting("patch", ""); + + // The upgrade process completed successfully. + $results['success'] = TRUE; + $results['message'] = "Upgrade to v2.8.5 successful."; + return $results; + + } catch(Exception $e) { + // Something went wrong during this upgrade process. + $results['success'] = FALSE; + $results['message'] = $e->getMessage(); + return $results; + } + } +?> + diff --git a/build/portal/html/install/upgrade.php b/build/portal/html/install/upgrade.php index 296782ff..837c5ff6 100644 --- a/build/portal/html/install/upgrade.php +++ b/build/portal/html/install/upgrade.php @@ -33,7 +33,7 @@ $common = new common(); // The most current stable release. - $thisVersion = "2.8.4"; + $thisVersion = "2.8.5"; // Begin the upgrade process if this release is newer than what is installed. if ($common->getSetting("version") == $thisVersion) { @@ -222,6 +222,15 @@ $version = "2.8.4"; } + // UPGRADE TO V2.8.5 + if ($common->getSetting("version") == "2.8.4" && $success) { + $json = file_get_contents("http://localhost/install/upgrade-v2.8.5.php"); + $results = json_decode($json, TRUE); + $success = $results['success']; + $message = $results['message']; + $version = "2.8.5"; + } + require_once($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR."admin".DIRECTORY_SEPARATOR."includes".DIRECTORY_SEPARATOR."header.inc.php"); // Display the instalation wizard.