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

-fixed install issue when airtime/files directory was missing. 

-installer now displays correct airtime version string
This commit is contained in:
martin 2011-03-30 12:35:24 -04:00
parent 9c73ca246a
commit b0882cabd2
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
install/airtime-install.php
View File

@ -16,7 +16,7 @@ AirtimeIni::UpdateIniFiles();
require_once(dirname(__FILE__).'/../application/configs/conf.php');
require_once(dirname(__FILE__).'/include/AirtimeInstall.php');
echo PHP_EOL."*** Installing Airtime alpha 1.7 ***".PHP_EOL;
echo PHP_EOL."*** Installing Airtime ".AIRTIME_VERSION." ***".PHP_EOL;
echo PHP_EOL."*** Database Installation ***".PHP_EOL;

2
install/airtime-uninstall.php
View File

@ -15,7 +15,7 @@ require_once(dirname(__FILE__).'/include/AirtimeInstall.php');
AirtimeInstall::RemoveSymlinks();
echo "Uninstalling Airtime alpha 1.7".PHP_EOL;
echo "Uninstalling Airtime ".AIRTIME_VERSION.PHP_EOL;
echo "******************************* Uninstall Begin ********************************".PHP_EOL;
//------------------------------------------------------------------------

3
install/include/AirtimeIni.php
View File

@ -36,7 +36,6 @@ class AirtimeIni{
echo "Could not copy recorder.cfg to /etc/airtime/. Exiting.";
exit(1);
}
if (!copy(__DIR__."/../../python_apps/pypo/scripts/liquidsoap.cfg", "/etc/airtime/liquidsoap.cfg")){
echo "Could not copy liquidsoap.cfg to /etc/airtime/. Exiting.";
exit(1);
@ -107,7 +106,7 @@ class AirtimeIni{
{
$api_key = AirtimeIni::GenerateRandomString();
AirtimeIni::UpdateIniValue('/etc/airtime/airtime.conf', 'api_key', $api_key);
AirtimeIni::UpdateIniValue('/etc/airtime/airtime.conf', 'baseFilesDir', realpath(__DIR__.'/../../files'));
AirtimeIni::UpdateIniValue('/etc/airtime/airtime.conf', 'baseFilesDir', realpath(__DIR__.'/../../').'/files');
AirtimeIni::UpdateIniValue('/etc/airtime/pypo.cfg', 'api_key', "'$api_key'");
AirtimeIni::UpdateIniValue('/etc/airtime/recorder.cfg', 'api_key', "'$api_key'");
AirtimeIni::UpdateIniValue(__DIR__.'/../../build/build.properties', 'project.home', realpath(__dir__.'/../../'));