Merge pull request #3 from geekwright/newdirstructure

Fix directories
XOOPS · Feb 20, 2019 · 2e465b4 · 2e465b4
2 parents 9fc6cb7 + deccaaa
commit 2e465b4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ The `composer.json` of the main xoops-library package needs to set the filesyste
 
 ```JSON
     "extra": {
-        "xoops_modules": "/home/user/htdocs/modules/"
+        "xoops_modules": "/home/user/htdocs/modules"
     }
 ```
 

diff --git a/src/ModuleInstaller.php b/src/ModuleInstaller.php
@@ -21,14 +21,14 @@ public function getInstallPath(PackageInterface $package)
     {
         $moddir = explode('/', $package->getName());
 
-        $xoops_modules = '../modules/';
+        $xoops_modules = './htdocs/modules';
 
         $extra = $this->composer->getPackage()->getExtra();
         if (isset($extra['xoops_modules_path'])) {
             $xoops_modules = $extra['xoops_modules_path'];
         }
 
-        return $xoops_modules . $moddir[1];
+        return $xoops_modules . '/' . $moddir[1];
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up @@
     ```JSON
         "extra": {
-            "xoops_modules": "/home/user/htdocs/modules/"
+            "xoops_modules": "/home/user/htdocs/modules"
         }
     ```
@@ Expand Down @@