Revert "Module Updates for 2.6.0+ (Wave 1) (#69)" (#70)

This reverts commit 0a3e973d99.
This commit is contained in:
Marc
2019-08-21 21:10:21 +01:00
committed by GitHub
parent 0a3e973d99
commit 2ba1732389
68 changed files with 445 additions and 289 deletions

View File

@@ -1,5 +1,8 @@
<?php namespace pineapple;
putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
class dump1090 extends Module
{
public function route()
@@ -50,9 +53,9 @@ class dump1090 extends Module
}
}
protected function checkDep($dependencyName)
protected function checkDependency($dependencyName)
{
return ($this->checkDependency($dependencyName) && ($this->uciGet("dump1090.module.installed")));
return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("dump1090.module.installed")));
}
protected function getDevice()
@@ -68,7 +71,7 @@ class dump1090 extends Module
private function handleDependencies()
{
if (!$this->checkDep("dump1090")) {
if (!$this->checkDependency("dump1090")) {
$this->execBackground("/pineapple/modules/dump1090/scripts/dependencies.sh install ".$this->request->destination);
$this->response = array('success' => true);
} else {