From 00d7d5481e5b37c0cd1ae5df2b8dea7dccca9f8c Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Mon, 1 Jul 2019 21:25:25 +0800
Subject: [PATCH] Allow to use relative path at `PLUGINS_DIR`

---
 app/Services/PluginManager.php           | 7 ++++++-
 resources/misc/changelogs/en/4.3.0.md    | 1 +
 resources/misc/changelogs/zh_CN/4.3.0.md | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/Services/PluginManager.php b/app/Services/PluginManager.php
index edf3ea25..d8b0c194 100644
--- a/app/Services/PluginManager.php
+++ b/app/Services/PluginManager.php
@@ -68,6 +68,9 @@ class PluginManager
 
             $installed = [];
 
+            $cwd = getcwd();
+            chdir(base_path());
+
             try {
                 $resource = opendir($this->getPluginsDir());
             } catch (\Exception $e) {
@@ -125,6 +128,8 @@ class PluginManager
             $this->plugins = $plugins->sortBy(function ($plugin, $name) {
                 return $plugin->name;
             });
+
+            chdir($cwd);
         }
 
         return $this->plugins;
@@ -400,7 +405,7 @@ class PluginManager
      */
     public function getPluginsDir()
     {
-        return config('plugins.directory') ?: base_path('plugins');
+        return config('plugins.directory') ? realpath(config('plugins.directory')) : base_path('plugins');
     }
 
     /**
diff --git a/resources/misc/changelogs/en/4.3.0.md b/resources/misc/changelogs/en/4.3.0.md
index 9d4d1435..c4fe2bff 100644
--- a/resources/misc/changelogs/en/4.3.0.md
+++ b/resources/misc/changelogs/en/4.3.0.md
@@ -3,6 +3,7 @@
 - Supported Chrome's `theme-color`.
 - Allowed to customize HTTP status code for rejecting accessing private texture.
 - Added configurable "Explore" menu.
+- Custom `PLUGINS_DIR` with relative path is allowed.
 
 ## Tweaked
 
diff --git a/resources/misc/changelogs/zh_CN/4.3.0.md b/resources/misc/changelogs/zh_CN/4.3.0.md
index 07619384..f50c1172 100644
--- a/resources/misc/changelogs/zh_CN/4.3.0.md
+++ b/resources/misc/changelogs/zh_CN/4.3.0.md
@@ -3,6 +3,7 @@
 - 支持 Chrome 的 `theme-color` 属性
 - 允许自定义拒绝访问私有材质时返回的 HTTP 状态码
 - 添加可自定义的「浏览」菜单
+- 允许在 `PLUGINS_DIR` 配置项中使用相对路径
 
 ## 调整