diff --git a/CHANGELOG.md b/CHANGELOG.md index 642486b..32b1912 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,11 @@ The following is a history of the changes made to this project. -## v2.8.8 *(next release)* +## v2.8.8 *(October 18th, 2024)* * FlightAware's version of the tcl-tls is now built and installed on Bullseye. -* Clones athe trixie branch directly when using the forked version of piaware_builder. +* Clones the trixie branch directly when using the forked version of piaware_builder. +* The portal upgrade path to v2.8.7 was missing. ## v2.8.7 *(August 23rd, 2024)* diff --git a/CREDITS.md b/CREDITS.md index ce1d598..c3edc78 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -3,7 +3,8 @@ ## Collaborators and Contributors First and foremost I would like to thank the collaborators and contributors who have contributed to -the project directly. Their time and effort is greatly appreciated by myself as well as many others. +the project directly through code contributions made directly to the repository. Their time and effort +is greatly appreciated by myself as well as many others I am sure. * @adamkaplan * @atbPy diff --git a/README.md b/README.md index 5fc911d..74d470b 100644 --- a/README.md +++ b/README.md @@ -81,8 +81,8 @@ The project currently supports the following Linux distributions. * Debian _(Bookworm and Bullseye)_ * DietPi _(Bookworm and Bullseye)_ * Raspberry PI OS _(Bookworm and Bullseye)_ -* Ubuntu _(Jammy Jellyfish, Focal Fossa and Noble Numbat)_ +* Ubuntu _(Jammy Jellyfish, Focal Fossa and Noble Numbat*)_ Support is available via this repository through the use of the issue tracker or discussions. -_Please Note that Ubuntu Noble Numbat support employs an unofficial fix for PiAware._ +_* Please Note that Ubuntu Noble Numbat support employs an unofficial fix for PiAware._ diff --git a/build/portal/html/classes/template.class.php b/build/portal/html/classes/template.class.php index 172c9f3..7289a8d 100644 --- a/build/portal/html/classes/template.class.php +++ b/build/portal/html/classes/template.class.php @@ -8,7 +8,7 @@ // Check if the portal is installed or needs upgraded. - $thisVersion = "2.8.7"; + $thisVersion = "2.8.8"; 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 b01c29a..30ea58c 100644 --- a/build/portal/html/install/index.php +++ b/build/portal/html/install/index.php @@ -1,6 +1,6 @@ updateSetting("version", "2.8.8"); + $common->updateSetting("patch", ""); + + // The upgrade process completed successfully + $results['success'] = TRUE; + $results['message'] = "Upgrade to v2.8.8 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 56fe6de..9cc35a7 100644 --- a/build/portal/html/install/upgrade.php +++ b/build/portal/html/install/upgrade.php @@ -4,7 +4,7 @@ $common = new common(); // The most current stable release. - $thisVersion = "2.8.7"; + $thisVersion = "2.8.8"; // Begin the upgrade process if this release is newer than what is installed. if ($common->getSetting("version") == $thisVersion) { @@ -211,6 +211,24 @@ $version = "2.8.6"; } + // UPGRADE TO V2.8.7 + if ($common->getSetting("version") == "2.8.6" && $success) { + $json = file_get_contents("http://localhost/install/upgrade-v2.8.7.php"); + $results = json_decode($json, TRUE); + $success = $results['success']; + $message = $results['message']; + $version = "2.8.7"; + } + + // UPGRADE TO V2.8.8 + if ($common->getSetting("version") == "2.8.7" && $success) { + $json = file_get_contents("http://localhost/install/upgrade-v2.8.8.php"); + $results = json_decode($json, TRUE); + $success = $results['success']; + $message = $results['message']; + $version = "2.8.8"; + } + require_once($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR."admin".DIRECTORY_SEPARATOR."includes".DIRECTORY_SEPARATOR."header.inc.php"); // Display the instalation wizard. diff --git a/install.sh b/install.sh index 8c68aeb..06d546d 100755 --- a/install.sh +++ b/install.sh @@ -2,7 +2,7 @@ ## ASSIGN VARIABLE -project_version="2.8.7" +project_version="2.8.8" printf -v date_time '%(%Y-%m-%d_%H-%M-%S)T' -1 log_file="adsb-installer_${date_time}.log"