From 3ff89bc64853b04b9a4f27526ca9e1daff313970 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Wed, 12 Jul 2017 18:33:43 +0900 Subject: [PATCH] (refs #1484)Add --plugin_dir option --- src/main/java/JettyLauncher.java | 3 +++ src/main/scala/gitbucket/core/util/Directory.scala | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/JettyLauncher.java b/src/main/java/JettyLauncher.java index 849ed3c2b..70044c926 100644 --- a/src/main/java/JettyLauncher.java +++ b/src/main/java/JettyLauncher.java @@ -48,6 +48,9 @@ public class JettyLauncher { case "--temp_dir": tmpDirPath = dim[1]; break; + case "--plugin_dir": + System.setProperty("gitbucket.pluginDir", dim[1]); + break; } } } diff --git a/src/main/scala/gitbucket/core/util/Directory.scala b/src/main/scala/gitbucket/core/util/Directory.scala index e54a7862a..73adcfd53 100644 --- a/src/main/scala/gitbucket/core/util/Directory.scala +++ b/src/main/scala/gitbucket/core/util/Directory.scala @@ -32,7 +32,7 @@ object Directory { val DatabaseHome = s"${GitBucketHome}/data" - val PluginHome = s"${GitBucketHome}/plugins" + val PluginHome = Option(System.getProperty("gitbucket.pluginDir")).getOrElse(s"${GitBucketHome}/plugins") val TemporaryHome = s"${GitBucketHome}/tmp" @@ -90,4 +90,4 @@ object Directory { def getWikiRepositoryDir(owner: String, repository: String): File = new File(s"${RepositoryHome}/${owner}/${repository}.wiki.git") -} \ No newline at end of file +}