From ec4287626657c3c570e0961cab487ca8221b698b Mon Sep 17 00:00:00 2001 From: James Date: Mon, 3 Oct 2011 17:11:16 -0400 Subject: [PATCH] CC-2901: Uninstall script should remove 'distribute' tarball if it was installed previously - fixed --- install_minimal/include/AirtimeInstall.php | 7 +++++++ install_minimal/include/airtime-uninstall.php | 1 + 2 files changed, 8 insertions(+) diff --git a/install_minimal/include/AirtimeInstall.php b/install_minimal/include/AirtimeInstall.php index 41175a913..fc432c166 100644 --- a/install_minimal/include/AirtimeInstall.php +++ b/install_minimal/include/AirtimeInstall.php @@ -462,4 +462,11 @@ class AirtimeInstall fwrite($fp, "$minute $hour * * * root /usr/lib/airtime/utils/phone_home_stat\n"); fclose($fp); } + + public static function removeVirtualEnvDistributeFile(){ + echo "* Removing distribute-0.6.10.tar.gz".PHP_EOL; + if(file_exists('/usr/share/python-virtualenv/distribute-0.6.10.tar.gz')){ + exec("rm -f /usr/share/python-virtualenv/distribute-0.6.10.tar.gz"); + } + } } diff --git a/install_minimal/include/airtime-uninstall.php b/install_minimal/include/airtime-uninstall.php index 3445b230c..cdcc987c4 100644 --- a/install_minimal/include/airtime-uninstall.php +++ b/install_minimal/include/airtime-uninstall.php @@ -80,6 +80,7 @@ if ($results == 0) { AirtimeInstall::RemoveSymlinks(); AirtimeInstall::UninstallBinaries(); AirtimeInstall::RemoveLogDirectories(); +AirtimeInstall::removeVirtualEnvDistributeFile(); AirtimeIni::RemoveMonitFile(); @unlink('/etc/cron.d/airtime-crons');