X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fupdate-gosa;h=a4f418e1f05f3dd23e1dbb734bc1ab4445841bef;hb=f0d477d2c54952fcf7334cd6cc573a5495b443ce;hp=9d3b2738dfbb6e0f6a07b12f02af23a60f7def49;hpb=cd14033a90e07b37860a4932c5ccbbc5d85e342c;p=gosa.git diff --git a/gosa-core/update-gosa b/gosa-core/update-gosa index 9d3b2738d..a4f418e1f 100755 --- a/gosa-core/update-gosa +++ b/gosa-core/update-gosa @@ -48,7 +48,11 @@ function get_classes($folder= ".") static $result= array(); if ($base_dir == ""){ - $base_dir= getcwd(); + if ($folder == "."){ + $base_dir= getcwd(); + } else { + $base_dir= $folder; + } } $currdir=getcwd(); @@ -290,7 +294,14 @@ function install_plugin($file) /* Check if dependencies are fullfilled */ foreach ($depends as $dep){ - if (!in_array($dep, $provides)){ + $found= false; + foreach ($provides as $provide => $dummy){ + if ($dep == $provide){ + $found= true; + break; + } + } + if (!$found){ echo "! Error: plugin depends on '$dep', but this is not installed\n\n"; exit (3); } @@ -388,7 +399,7 @@ function remove_plugin($name) /* Depends? */ foreach ($depends as $sname => $pl_depends){ - if (!in_array($name, $pl_depends)){ + if (in_array($name, $pl_depends)){ echo "! Error: plugin '$sname' depends on '$name' - cannot remove it\n\n"; exit (1); }