mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7505 from nextcloud/do-not-update-if-app-comes-from-git 

Do not update apps if it comes from git
This commit is contained in:
Morris Jobke 2017-12-18 13:43:58 +01:00 committed by GitHub
parent 19ffdecb4f 2dbd5052ff
commit 97f80f5581
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/private/Installer.php
View File

@ -395,6 +395,10 @@ class Installer {
return false; return false;
} }
if ($this->isInstalledFromGit($appId) === true) {
return false;
}
if ($this->apps === null) { if ($this->apps === null) {
$this->apps = $this->appFetcher->get(); $this->apps = $this->appFetcher->get();
} }
@ -414,6 +418,22 @@ class Installer {
return false; return false;
} }
/**
* Check if app has been installed from git
* @param string $name name of the application to remove
* @return boolean
*
* The function will check if the path contains a .git folder
*/
private function isInstalledFromGit($appId) {
$app = \OC_App::findAppInDirectories($appId);
if($app === false) {
return false;
}
$basedir = $app['path'].'/'.$appId;
return file_exists($basedir.'/.git/');
}
/** /**
* Check if app is already downloaded * Check if app is already downloaded
* @param string $name name of the application to remove * @param string $name name of the application to remove