aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-main/src/main
diff options
context:
space:
mode:
authorSébastien Lesaint <sebastien.lesaint@sonarsource.com>2019-03-13 15:20:19 +0100
committerSonarTech <sonartech@sonarsource.com>2019-03-19 20:21:26 +0100
commit0dea4ed30e0a3a333808d1bf0565cb032cc1a39e (patch)
treeefdd39d69fcebf27c556798fc8946e01f9c49e15 /server/sonar-main/src/main
parent90660265e4ee3255cd5680bdcf10bbe854f82f21 (diff)
downloadsonarqube-0dea4ed30e0a3a333808d1bf0565cb032cc1a39e.tar.gz
sonarqube-0dea4ed30e0a3a333808d1bf0565cb032cc1a39e.zip
SONAR-11792 only ES executable for linux/mac is used
Diffstat (limited to 'server/sonar-main/src/main')
-rw-r--r--server/sonar-main/src/main/java/org/sonar/application/es/EsInstallation.java9
1 files changed, 1 insertions, 8 deletions
diff --git a/server/sonar-main/src/main/java/org/sonar/application/es/EsInstallation.java b/server/sonar-main/src/main/java/org/sonar/application/es/EsInstallation.java
index 12789f8c38b..8ec7f31c7af 100644
--- a/server/sonar-main/src/main/java/org/sonar/application/es/EsInstallation.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/es/EsInstallation.java
@@ -103,14 +103,7 @@ public class EsInstallation {
}
public File getExecutable() {
- return new File(homeDirectory, "bin/" + getExecutableName());
- }
-
- private static String getExecutableName() {
- if (System.getProperty("os.name").startsWith("Windows")) {
- return "elasticsearch.bat";
- }
- return "elasticsearch";
+ return new File(homeDirectory, "bin/elasticsearch");
}
public File getLog4j2PropertiesLocation() {