Skip to content

Commit

Permalink
Marked as v2.8.5.
Browse files Browse the repository at this point in the history
  • Loading branch information
jprochazka committed Jul 24, 2024
1 parent af5b30d commit 77bfdc5
Show file tree
Hide file tree
Showing 6 changed files with 86 additions and 7 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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._
_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._
2 changes: 1 addition & 1 deletion build/portal/html/classes/template.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion build/portal/html/install/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -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")) {
Expand Down
68 changes: 68 additions & 0 deletions build/portal/html/install/upgrade-v2.8.5.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
<?php

/////////////////////////////////////////////////////////////////////////////////////
// ADS-B RECEIVER PORTAL //
// =============================================================================== //
// Copyright and Licensing Information: //
// //
// The MIT License (MIT) //
// //
// Copyright (c) 2015 Joseph A. Prochazka //
// //
// Permission is hereby granted, free of charge, to any person obtaining a copy //
// of this software and associated documentation files (the "Software"), to deal //
// in the Software without restriction, including without limitation the rights //
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell //
// copies of the Software, and to permit persons to whom the Software is //
// furnished to do so, subject to the following conditions: //
// //
// The above copyright notice and this permission notice shall be included in all //
// copies or substantial portions of the Software. //
// //
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR //
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, //
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE //
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER //
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, //
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE //
// SOFTWARE. //
/////////////////////////////////////////////////////////////////////////////////////

///////////////////////
// UPGRADE TO V2.8.5
///////////////////////

// --------------------------------------------------------
// Updates the version setting to 2.8.5.
// --------------------------------------------------------

$results = upgrade();
exit(json_encode($results));

function upgrade() {
require_once($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR."classes".DIRECTORY_SEPARATOR."common.class.php");
require_once($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR."classes".DIRECTORY_SEPARATOR."settings.class.php");

$common = new common();
$settings = new settings();

try {

// Update the version and patch settings..
$common->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;
}
}
?>

11 changes: 10 additions & 1 deletion build/portal/html/install/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit 77bfdc5

Please sign in to comment.