Upgraded version number to 2.2.0

This commit is contained in:
Rudi Grinberg 2012-08-22 10:39:26 -04:00
parent c9afe4fa47
commit 73e52adee1
5 changed files with 13 additions and 13 deletions

View File

@ -1,3 +1,3 @@
<?php <?php
define('AIRTIME_VERSION', '2.1.3'); define('AIRTIME_VERSION', '2.2.0');

View File

@ -21,8 +21,8 @@ if (!file_exists('/etc/airtime/airtime.conf')) {
} }
require_once(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/db-conf.php"); require_once(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/db-conf.php");
require_once('propel/runtime/lib/Propel.php'); require_once('propel/runtime/lib/Propel.php');
Propel::init(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/airtime-conf-production.php"); Propel::init(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/airtime-conf-production.php");
$version = AirtimeInstall::GetVersionInstalled(); $version = AirtimeInstall::GetVersionInstalled();

View File

@ -1,4 +1,4 @@
DELETE FROM cc_pref WHERE keystr = 'system_version'; DELETE FROM cc_pref WHERE keystr = 'system_version';
INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', '2.1.3'); INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', '2.2.0');
UPDATE cc_show_instances SET time_filled='00:00:00' WHERE time_filled IS NULL; UPDATE cc_show_instances SET time_filled='00:00:00' WHERE time_filled IS NULL;

View File

@ -3,16 +3,16 @@
* creating connections to a database, backing up config files etc. * creating connections to a database, backing up config files etc.
*/ */
class UpgradeCommon{ class UpgradeCommon{
const CONF_FILE_AIRTIME = "/etc/airtime/airtime.conf"; const CONF_FILE_AIRTIME = "/etc/airtime/airtime.conf";
const CONF_FILE_PYPO = "/etc/airtime/pypo.cfg"; const CONF_FILE_PYPO = "/etc/airtime/pypo.cfg";
const CONF_FILE_LIQUIDSOAP = "/etc/airtime/liquidsoap.cfg"; const CONF_FILE_LIQUIDSOAP = "/etc/airtime/liquidsoap.cfg";
const CONF_FILE_MEDIAMONITOR = "/etc/airtime/media-monitor.cfg"; const CONF_FILE_MEDIAMONITOR = "/etc/airtime/media-monitor.cfg";
const CONF_FILE_API_CLIENT = "/etc/airtime/api_client.cfg"; const CONF_FILE_API_CLIENT = "/etc/airtime/api_client.cfg";
const CONF_PYPO_GRP = "pypo"; const CONF_PYPO_GRP = "pypo";
const CONF_WWW_DATA_GRP = "www-data"; const CONF_WWW_DATA_GRP = "www-data";
const CONF_BACKUP_SUFFIX = "220"; const CONF_BACKUP_SUFFIX = "220";
const VERSION_NUMBER = "2.2.0"; const VERSION_NUMBER = "2.2.0";
public static function SetDefaultTimezone() public static function SetDefaultTimezone()
{ {

View File

@ -18,7 +18,7 @@ from configobj import ConfigObj
import string import string
import traceback import traceback
AIRTIME_VERSION = "2.1.3" AIRTIME_VERSION = "2.2.0"
def to_unicode(obj, encoding='utf-8'): def to_unicode(obj, encoding='utf-8'):
if isinstance(obj, basestring): if isinstance(obj, basestring):