Fixed bug on uninstall where it would complain about removing files that
didnt exist, and also would stop the uninstallation if it couldnt connect to the database.
This commit is contained in:
parent
37f6812194
commit
7684fedb50
2 changed files with 7 additions and 7 deletions
|
@ -39,7 +39,7 @@ $command = "sudo -u postgres dropdb {$CC_CONFIG['dsn']['database']} 2> /dev/null
|
||||||
//------------------------------------------------------------------------
|
//------------------------------------------------------------------------
|
||||||
if ($dbDeleteFailed) {
|
if ($dbDeleteFailed) {
|
||||||
echo " * Couldn't delete the database, so deleting all the DB tables...".PHP_EOL;
|
echo " * Couldn't delete the database, so deleting all the DB tables...".PHP_EOL;
|
||||||
AirtimeInstall::DbConnect(true);
|
AirtimeInstall::DbConnect(false);
|
||||||
|
|
||||||
if (!PEAR::isError($CC_DBC)) {
|
if (!PEAR::isError($CC_DBC)) {
|
||||||
$sql = "select * from pg_tables where tableowner = 'airtime'";
|
$sql = "select * from pg_tables where tableowner = 'airtime'";
|
||||||
|
|
|
@ -214,8 +214,8 @@ class AirtimeInstall {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function RemoveSymlinks(){
|
public static function RemoveSymlinks(){
|
||||||
exec("rm /usr/bin/airtime-import");
|
exec("rm -f /usr/bin/airtime-import");
|
||||||
exec("rm /usr/bin/airtime-clean-storage");
|
exec("rm -f /usr/bin/airtime-clean-storage");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue