From 5e733a42769e42a1e7c3e668cb2511ad8c865c58 Mon Sep 17 00:00:00 2001 From: Paul Baranowski Date: Mon, 20 Jun 2011 16:53:23 -0400 Subject: [PATCH] CC-2406: Reinstall + recreating the database tables doesnt work This was caused because updating the build.properties file did not happen unless you chose to overwrite your existing configuration files. Changed it so that it always updates the build.properties file. --- install/airtime-install.php | 3 +++ install/include/AirtimeIni.php | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/install/airtime-install.php b/install/airtime-install.php index ebec6de04..c44c5c106 100644 --- a/install/airtime-install.php +++ b/install/airtime-install.php @@ -108,6 +108,9 @@ if ($overwrite) { AirtimeIni::UpdateIniFiles(); } +// Update the build.properties file to point to the correct directory. +AirtimeIni::UpdateIniValue(AirtimeInstall::CONF_DIR_WWW.'/build/build.properties', 'project.home', AirtimeInstall::CONF_DIR_WWW); + require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php'); echo "* Airtime Version: ".AIRTIME_VERSION.PHP_EOL; diff --git a/install/include/AirtimeIni.php b/install/include/AirtimeIni.php index 1dc2b7d19..e690a4723 100644 --- a/install/include/AirtimeIni.php +++ b/install/include/AirtimeIni.php @@ -195,7 +195,6 @@ class AirtimeIni AirtimeIni::UpdateIniValue(AirtimeIni::CONF_FILE_PYPO, 'api_key', "'$api_key'"); AirtimeIni::UpdateIniValue(AirtimeIni::CONF_FILE_RECORDER, 'api_key', "'$api_key'"); AirtimeIni::UpdateIniValue(AirtimeIni::CONF_FILE_MEDIAMONITOR, 'api_key', "'$api_key'"); - AirtimeIni::UpdateIniValue(AirtimeInstall::CONF_DIR_WWW.'/build/build.properties', 'project.home', AirtimeInstall::CONF_DIR_WWW); } public static function ReadPythonConfig($p_filename)