Switch from /bin/bash to bash, as /bin/bash fails on windows (needs t…

…o be investigated)
vjuranek · Mar 21, 2012 · 32624f8 · 32624f8
1 parent 8d628ea
commit 32624f8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/main/java/builder/smartfrog/SmartFrogAction.java b/src/main/java/builder/smartfrog/SmartFrogAction.java
@@ -37,7 +37,6 @@
 import java.io.PrintStream;
 import java.io.Reader;
 import java.nio.charset.Charset;
-import java.util.Map;
 import java.util.Vector;
 
 import org.kohsuke.stapler.StaplerRequest;
@@ -91,8 +90,6 @@ public void perform(final AbstractBuild<?, ?> build, final Launcher launcher, fi
         log = new StreamBuildListener(new PrintStream(new SFFilterOutputStream(new FileOutputStream(getLogFile()))),
                 Charset.defaultCharset());
         proc = launcher.launch().cmds(cl).envs(build.getEnvironment(log)).pwd(build.getWorkspace()).stdout(log).start();
-        //Map<String,String> env = build.getEnvVars();
-        //proc = launcher.launch(cl, env, log.getLogger(), build.getParent().getWorkspace());
         execThread = new Thread(this, "SFDaemon - " + host);
         execThread.start();
     }

diff --git a/src/main/java/builder/smartfrog/SmartFrogBuilder.java b/src/main/java/builder/smartfrog/SmartFrogBuilder.java
@@ -366,19 +366,19 @@ private void failBuild(AbstractBuild<?, ?> build, SmartFrogAction[] sfActions) {
 
     protected String[] buildDaemonCommandLine(String host, String workspace) {
         String iniPath = useAltIni ? sfIni : sfInstance.getPath() + "/bin/default.ini";
-        return new String[] { "/bin/bash", "-xe", sfInstance.getSupport() + "/runSF.sh", host, sfInstance.getPath(),
+        return new String[] { "bash", "-xe", sfInstance.getSupport() + "/runSF.sh", host, sfInstance.getPath(),
                 sfUserHome, sfInstance.getSupport(), sfUserHome2, sfUserHome3, sfUserHome4, workspace, getSfOpts(),
                 iniPath, exportMatrixAxes };
     }
 
     protected String[] buildStopDaemonCommandLine(String host) {
-        return new String[] { "/bin/bash", "-xe", sfInstance.getSupport() + "/stopSF.sh", host, sfInstance.getPath(),
+        return new String[] { "bash", "-xe", sfInstance.getSupport() + "/stopSF.sh", host, sfInstance.getPath(),
                 sfUserHome };
     }
 
     protected String[] buildDeployCommandLine(String host, String componentName, String workspace) {
         String defaultScriptPath = sfScriptSource != null ? sfScriptSource.getDefaultScriptPath() : "";
-        return new String[] { "/bin/bash", "-xe", sfInstance.getSupport() + "/deploySF.sh", host, sfInstance.getPath(),
+        return new String[] { "bash", "-xe", sfInstance.getSupport() + "/deploySF.sh", host, sfInstance.getPath(),
                 sfUserHome, sfInstance.getSupport(), sfUserHome2, sfUserHome3, sfUserHome4, defaultScriptPath,
                 componentName, workspace, exportMatrixAxes };
     }