Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CC-2281 Install script should check for pre-installed versions and prompt user to upgrade/full installation 

Hand-merged Naomi's last 3 changes from the branch.
This commit is contained in:
Paul Baranowski 2011-05-24 21:27:33 -04:00
parent 2866bf46cd
commit e90a3269c2
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
install/airtime-install.php
View File

@ -3,6 +3,10 @@
* @package Airtime * @package Airtime
* @copyright 2011 Sourcefabric O.P.S. * @copyright 2011 Sourcefabric O.P.S.
* @license http://www.gnu.org/licenses/gpl.txt * @license http://www.gnu.org/licenses/gpl.txt
*
* Checks if a previous version of Airtime is currently installed, upgrades Airtime if so.
* Performs a new install (new configs, database install) if a version of Airtime is not found
* If the current version is found to be installed the User is presented with the help menu and can choose -r to reinstall.
*/ */
set_include_path(__DIR__.'/../airtime_mvc/library' . PATH_SEPARATOR . get_include_path()); set_include_path(__DIR__.'/../airtime_mvc/library' . PATH_SEPARATOR . get_include_path());
@ -16,7 +20,7 @@ require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/constants.
AirtimeInstall::ExitIfNotRoot(); AirtimeInstall::ExitIfNotRoot();
$newInstall = false; $newInstall = false;
$version = AirtimeInstall::CheckForVersionBeforeInstall(); $version = AirtimeInstall::GetVersionInstalled();
require_once('Zend/Loader/Autoloader.php'); require_once('Zend/Loader/Autoloader.php');
$autoloader = Zend_Loader_Autoloader::getInstance(); $autoloader = Zend_Loader_Autoloader::getInstance();
@ -43,17 +47,15 @@ if (isset($opts->h)) {
} }
//the current version exists. //the current version exists.
if(isset($version) && $version != false && $version == AIRTIME_VERSION && !isset($opts->r)) { if(isset($version) && ($version != false) && ($version == AIRTIME_VERSION) && !isset($opts->r)) {
echo "Airtime $version is already installed.".PHP_EOL; echo "Airtime $version is already installed.".PHP_EOL;
echo $opts->getUsageMessage();
exit(); exit();
} }
//a previous version exists. //a previous version exists.
if(isset($version) && $version != false && $version < AIRTIME_VERSION) { if(isset($version) && ($version != false) && ($version < AIRTIME_VERSION)) {
echo "Airtime version $version found.".PHP_EOL; echo "Airtime version $version found.".PHP_EOL;
$command = "php airtime-upgrade.php"; require_once("airtime-upgrade.php");
system($command);
exit(); exit();
} }
if(is_null($version)) { if(is_null($version)) {
@ -61,7 +63,7 @@ if(is_null($version)) {
} }
$db_install = true; $db_install = true;
if (is_null($opts->r) && isset($opts->n) && !$newInstall){ if (is_null($opts->r) && isset($opts->n)){
$db_install = false; $db_install = false;
} }

2
install/include/AirtimeInstall.php
View File

@ -34,7 +34,7 @@ class AirtimeInstall
} }
} }
public static function CheckForVersionBeforeInstall() public static function GetVersionInstalled()
{ {
global $CC_DBC, $CC_CONFIG; global $CC_DBC, $CC_CONFIG;