diff --git a/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php index d05985a20..c077e1c25 100644 --- a/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php +++ b/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php @@ -213,24 +213,6 @@ function MergeConfigFiles($configFiles, $suffix) } } -function InstallPhpCode() -{ - global $CC_CONFIG; - global $AIRTIME_SRC; - echo "* Installing PHP code to ".$CC_CONFIG['phpDir'].PHP_EOL; - exec("mkdir -p ".$CC_CONFIG['phpDir']); - exec("cp -R ".$AIRTIME_SRC."/* ".$CC_CONFIG['phpDir']); - -} - -function InstallBinaries() -{ - global $AIRTIME_UTILS; - echo "* Installing binaries to ".CONF_DIR_BINARIES.PHP_EOL; - exec("mkdir -p ".CONF_DIR_BINARIES); - exec("cp -R ".$AIRTIME_UTILS." ".CONF_DIR_BINARIES); -} - // Backup the config files $suffix = date("Ymdhis")."-1.8.1"; foreach ($configFiles as $conf) { @@ -245,6 +227,3 @@ echo "* Initializing INI files".PHP_EOL; MergeConfigFiles($configFiles, $suffix); $CC_CONFIG = LoadConfig($CC_CONFIG); - -InstallPhpCode(); -InstallBinaries(); diff --git a/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php index 6ed7d1ec7..788db3e26 100644 --- a/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php +++ b/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php @@ -213,23 +213,6 @@ function MergeConfigFiles($configFiles, $suffix) } } -function InstallPhpCode() -{ - global $CC_CONFIG; - global $AIRTIME_SRC; - echo "* Installing PHP code to ".$CC_CONFIG['phpDir'].PHP_EOL; - exec("mkdir -p ".$CC_CONFIG['phpDir']); - exec("cp -R ".$AIRTIME_SRC."/* ".$CC_CONFIG['phpDir']); -} - -function InstallBinaries() -{ - global $AIRTIME_UTILS; - echo "* Installing binaries to ".CONF_DIR_BINARIES.PHP_EOL; - exec("mkdir -p ".CONF_DIR_BINARIES); - exec("cp -R ".$AIRTIME_UTILS." ".CONF_DIR_BINARIES); -} - $suffix = date("Ymdhis")."-1.8.2"; foreach ($configFiles as $conf) { if (file_exists($conf)) { @@ -243,6 +226,3 @@ echo "* Initializing INI files".PHP_EOL; MergeConfigFiles($configFiles, $suffix); $CC_CONFIG = LoadConfig($CC_CONFIG); - -InstallPhpCode(); -InstallBinaries(); diff --git a/install_minimal/upgrades/airtime-1.9.0/media-monitor-upgrade.py b/install_minimal/upgrades/airtime-1.9.0/media-monitor-upgrade.py index 7ccc68bf1..7eebc9d93 100644 --- a/install_minimal/upgrades/airtime-1.9.0/media-monitor-upgrade.py +++ b/install_minimal/upgrades/airtime-1.9.0/media-monitor-upgrade.py @@ -38,7 +38,8 @@ mmc = MediaMonitorCommon(mmconfig) try: os.makedirs(organize_dir) except Exception, e: - print e + #organize dir already exists. ( really shouldn't though ) + pass #older versions of Airtime installed from repository at least had owner of stor dir as "root" mmc.set_needed_file_permissions(stor_dir, True)