From 60ba5508a4bfaf0581301a6240011060a7432997 Mon Sep 17 00:00:00 2001 From: Robin Appelman <icewind@owncloud.com> Date: Thu, 29 Mar 2012 00:11:29 +0200 Subject: [PATCH] add support for installing apps from a subfolder in the zip/tgz file --- lib/installer.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/installer.php b/lib/installer.php index db64d8e32d..c5ecacae54 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -104,6 +104,17 @@ class OC_Installer{ } //load the info.xml file of the app + if(!is_file($extractDir.'/appinfo/info.xml')){ + //try to find it in a subdir + $dh=opendir($extractDir); + while($folder=readdir($dh)){ + if(substr($folder,0,1)!='.' and is_dir($extractDir.'/'.$folder)){ + if(is_file($extractDir.'/'.$folder.'/appinfo/info.xml')){ + $extractDir.='/'.$folder; + } + } + } + } if(!is_file($extractDir.'/appinfo/info.xml')){ OC_Log::write('core','App does not provide an info.xml file',OC_Log::ERROR); OC_Helper::rmdirr($extractDir); -- GitLab