[incubator-hop] branch master updated: Resolve filterPath to resolve ${HOP_CONFIG_FOLDER} and modify hop-config.json in-place

[hansva]

This is an automated email from the ASF dual-hosted git repository.

hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git


The following commit(s) were added to refs/heads/master by this push:
     new 9ff1b77  Resolve filterPath to resolve ${HOP_CONFIG_FOLDER} and modify 
hop-config.json in-place
     new eae2cbe  Merge pull request #653 from HiromuHota/HOP-2564
9ff1b77 is described below

commit 9ff1b77797af00e2bbd94ba7bc668623a9329473
Author: Hiromu Hota <hiromu.h...@gmail.com>
AuthorDate: Sun Feb 28 21:13:05 2021 -0800

    Resolve filterPath to resolve ${HOP_CONFIG_FOLDER} and modify 
hop-config.json in-place
---
 docker/Dockerfile.web                                             | 2 ++
 ui/src/main/java/org/apache/hop/ui/core/vfs/HopVfsFileDialog.java | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docker/Dockerfile.web b/docker/Dockerfile.web
index df1dc76..2af8b6e 100644
--- a/docker/Dockerfile.web
+++ b/docker/Dockerfile.web
@@ -29,3 +29,5 @@ RUN rm -rf webapps/* \
 COPY ./assemblies/web/target/webapp/ ${CATALINA_HOME}/webapps/ROOT/
 COPY ./assemblies/plugins/dist/target/plugins ${CATALINA_HOME}/plugins
 
+# Fix hop-config.json
+RUN sed -i 's/config\/projects/${HOP_CONFIG_FOLDER}\/projects/g' 
webapps/ROOT/config/hop-config.json
diff --git a/ui/src/main/java/org/apache/hop/ui/core/vfs/HopVfsFileDialog.java 
b/ui/src/main/java/org/apache/hop/ui/core/vfs/HopVfsFileDialog.java
index 30eab46..f62019b 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/vfs/HopVfsFileDialog.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/vfs/HopVfsFileDialog.java
@@ -1375,7 +1375,7 @@ public class HopVfsFileDialog implements IFileDialog, 
IDirectoryDialog {
 
   /** @param filterPath The filterPath to set */
   public void setFilterPath(String filterPath) {
-    this.filterPath = filterPath;
+    this.filterPath = variables.resolve(filterPath);
   }
 
   /**