Fix docker-compose executable check: refactoring based on review comm…

…ents (testcontainers#460)
bsnisar · Sep 22, 2017 · 98781e4 · 98781e4
1 parent df95e7b
commit 98781e4
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -532,12 +532,11 @@ public void invoke() {
     }
 
     private boolean dockerComposeExecutableExists() {
-        boolean dockerComposeExists = CommandLine.executableExists(COMPOSE_EXECUTABLE);
-        if (!dockerComposeExists && SystemUtils.IS_OS_WINDOWS) {
+        if (SystemUtils.IS_OS_WINDOWS) {
             return CommandLine.executableExists(COMPOSE_EXECUTABLE + ".exe");
+        } else {
+            return CommandLine.executableExists(COMPOSE_EXECUTABLE);
         }
-
-        return dockerComposeExists;
     }
 
     /**