From a2b7bd2a0bdd3cd6b8c3d93cf7f57e4b39544e56 Mon Sep 17 00:00:00 2001 From: martin Date: Fri, 15 Jul 2011 14:37:43 -0400 Subject: [PATCH] CC-2279: Upgrade script for converting stor directory to new format -further tweaks --- install/upgrades/airtime-1.9.0/airtime-upgrade.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/install/upgrades/airtime-1.9.0/airtime-upgrade.php b/install/upgrades/airtime-1.9.0/airtime-upgrade.php index 84a082a32..0b5b0e6a7 100644 --- a/install/upgrades/airtime-1.9.0/airtime-upgrade.php +++ b/install/upgrades/airtime-1.9.0/airtime-upgrade.php @@ -69,8 +69,9 @@ function UninstallBinaries() function removeOldAirtimeImport(){ + exec('rm -f "/usr/bin/airtime-import"'); + exec('rm -f "/usr/lib/airtime/utils/airtime-import.php"'); exec('rm -rf "/usr/lib/airtime/utils/airtime-import"'); - exec('rm -rf "/usr/lib/airtime/utils/airtime-import.php"'); } function updateAirtimeImportSymLink(){ @@ -418,11 +419,11 @@ $sql = "INSERT INTO cc_music_dirs (directory, type) VALUES ('$stor_dir', 'stor') echo $sql.PHP_EOL; execSqlQuery($sql); -$sql = "SELECT id FROM cc_music_dirs WHERE type='stor'" +$sql = "SELECT id FROM cc_music_dirs WHERE type='stor'"; echo $sql.PHP_EOL; $rows = execSqlQuery($sql); -echo "STORAGE ROW ID: $rows[0]"; +//echo "STORAGE ROW ID: $rows[0]"; //old database had a "fullpath" column that stored the absolute path of each track. We have to //change it so that the "fullpath" column has path relative to the "directory" column. @@ -431,7 +432,7 @@ mkdir("/var/log/airtime/media-monitor/", 755, true); touch("/var/log/airtime/media-monitor/media-monitor.log"); //create media monitor config: -if (!copy(__DIR__."/../../python_apps/media-monitor/media-monitor.cfg", CONF_FILE_MEDIAMONITOR)){ +if (!copy(__DIR__."/../../../python_apps/media-monitor/media-monitor.cfg", CONF_FILE_MEDIAMONITOR)){ echo "Could not copy media-monitor.cfg to /etc/airtime/. Exiting."; exit(1); }