Accounting for non standard plugin packages when using plugin-install

Some plugins .zip file decompress in non standard directory (e.g : zip file for atto_multilang2 decompresses into moodle-atto_multilang2-<version>; mod_hvp decompresses into 2 dir hvp and __MACOSX)

Moosh/Command/Generic/Plugin/PluginInstall.php

@@ -67,6 +67,8 @@ public function execute()
 
         if (!file_exists($tempdir)) {
             mkdir($tempdir);
+        } else {
+            run_external_command("rm -rf $tempdir/*");
         }
 
         if (!fopen($downloadedfile, 'w')) {
@@ -96,9 +98,13 @@ public function execute()
             }
         }
 
-        run_external_command("unzip $downloadedfile -d $installpath");
+        run_external_command("unzip $downloadedfile -d $tempdir");
         run_external_command("rm $downloadedfile");
 
+        //Get the path of uncompressed plugin dir (in case the .zip decompresses into multiple directories / non standard directory)
+        $uncompresseddir = exec("find $tempdir -name 'version.php' | rev | cut -d'/' -f 2- | rev");
+        run_external_command("mv $uncompresseddir $targetpath");
+
         echo "Installing\n";
         echo "\tname:    $pluginname\n";
         echo "\tversion: $version->version\n";