fix #488: use correct environment variables when running commands

Author: deadok22

src/org/intellij/erlang/rebar/settings/RebarConfigurationForm.java

@@ -85,7 +85,7 @@ private boolean validateRebarPath() {
     String rebarPath = myRebarPathSelector.getText();
     if (!new File(rebarPath).exists()) return false;
 
-    ExtProcessUtil.ExtProcessOutput output = ExtProcessUtil.execAndGetFirstLine(myRebarPathSelector.getText() + " --version", 3000);
+    ExtProcessUtil.ExtProcessOutput output = ExtProcessUtil.execAndGetFirstLine(3000, myRebarPathSelector.getText(), "--version");
     String version = output.getStdOut();
     if (version.startsWith("rebar")) {
       myRebarVersionText.setText(version);

src/org/intellij/erlang/settings/ErlangExternalToolsConfigurable.java

@@ -166,7 +166,7 @@ public void disposeUIResources() {
   }
 
   private void validateEmacsPath() {
-    String rawVersion = ExtProcessUtil.execAndGetFirstLine(myEmacsPathSelector.getText() + " --version", 3000).getStdOut();
+    String rawVersion = ExtProcessUtil.execAndGetFirstLine(3000, myEmacsPathSelector.getText(), "--version").getStdOut();
     myEmacsVersionText.setText(StringUtil.containsIgnoreCase(rawVersion, "emacs") ? rawVersion : "N/A");
   }
 }

src/org/intellij/erlang/utils/ExtProcessUtil.java

@@ -16,6 +16,8 @@
 
 package org.intellij.erlang.utils;
 
+import com.intellij.execution.ExecutionException;
+import com.intellij.execution.configurations.GeneralCommandLine;
 import com.intellij.openapi.util.text.StringUtil;
 import org.jetbrains.annotations.NotNull;
 
@@ -30,26 +32,31 @@ private ExtProcessUtil() {
   }
 
   @NotNull
-  public static ExtProcessOutput execAndGetFirstLine(@NotNull String cmd, long timeout) {
+  public static ExtProcessOutput execAndGetFirstLine(long timeout, @NotNull String... command) {
     try {
-      final Process cmdRunner = Runtime.getRuntime().exec(cmd);
+      final Process cmdRunner = new GeneralCommandLine(command).createProcess();
       ExecutorService singleTreadExecutor = Executors.newSingleThreadExecutor();
-      Future<ExtProcessOutput> cmdRunnerFuture = singleTreadExecutor.submit(new Callable<ExtProcessOutput>() {
-        @Override
-        public ExtProcessOutput call() throws Exception {
-          cmdRunner.waitFor();
-          String stdOut = readLine(cmdRunner.getInputStream());
-          String stdErr = readLine(cmdRunner.getErrorStream());
-          return new ExtProcessOutput(stdOut, stdErr);
-        }
-      });
       try {
-        return cmdRunnerFuture.get(timeout, TimeUnit.MILLISECONDS);
-      } catch (Exception e) { // Suppress
+        Future<ExtProcessOutput> cmdRunnerFuture = singleTreadExecutor.submit(new Callable<ExtProcessOutput>() {
+          @Override
+          public ExtProcessOutput call() throws Exception {
+            cmdRunner.waitFor();
+            String stdOut = readLine(cmdRunner.getInputStream());
+            String stdErr = readLine(cmdRunner.getErrorStream());
+            return new ExtProcessOutput(stdOut, stdErr);
+          }
+        });
+
+        try {
+          return cmdRunnerFuture.get(timeout, TimeUnit.MILLISECONDS);
+        } catch (Exception e) { // Suppress
+        }
+
+        cmdRunnerFuture.cancel(true);
+      } finally {
+        singleTreadExecutor.shutdown();
       }
-      cmdRunnerFuture.cancel(true);
-      singleTreadExecutor.shutdown();
-    } catch (IOException e) { // Suppress
+    } catch (ExecutionException e) { // Suppress
     }
     return new ExtProcessOutput("", "");
   }