This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 07c92edb4e59e802e6c3eec11fae4ca27e7b13b5 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Thu Jun 16 18:12:25 2016 +0200 Fix copy update script --- .../main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java | 4 +++- .../java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java index a877f47..4c27e00 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java @@ -208,7 +208,9 @@ public class EchoBaseConfiguration { EchoBaseConfigurationOption.UPDATE_EXECTUABLE_PATH.key); Preconditions.checkNotNull(file); return file; - } public File getRscriptExecutablePath() { + } + + public File getRscriptExecutablePath() { File file = applicationConfig.getOptionAsFile( EchoBaseConfigurationOption.RSCRIPT_EXECTUABLE_PATH.key); Preconditions.checkNotNull(file); diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java index a259f9c..baad374 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java @@ -66,12 +66,12 @@ public enum EchoBaseConfigurationOption implements ConfigOptionDef { UPDATE_EXECTUABLE_PATH( "echobase.update.executable.path", n("echobase.config.update.executable.path.description"), - "/usr/bin/Rscript", + "${echobase.bin.directory}/update-echobase.sh", File.class), RSCRIPT_EXECTUABLE_PATH( "echobase.Rscript.executable.path", n("echobase.config.Rscript.executable.path.description"), - "${echobase.bin.directory}/update_echobase.sh", + "/usr/bin/Rscript", File.class), EMBEDDED("echobase.embedded", n("echobase.config.embedded.description"), -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.