Merge pull request #3976 from ketan/fix/agent-pwd-whitespace

Fix issue with whitespace (#3966)
gocd · Nov 2, 2017 · fedb5c5 · fedb5c5
2 parents a684471 + ee992e6
commit fedb5c5
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/installers/go-agent/release/agent.sh b/installers/go-agent/release/agent.sh
@@ -126,8 +126,11 @@ if [ "$VNC" == "Y" ]; then
     export DISPLAY
 fi
 
-AGENT_STARTUP_ARGS="-Dcruise.console.publish.interval=10 -Xms$AGENT_MEM -Xmx$AGENT_MAX_MEM -Dgocd.agent.log.dir=$GO_AGENT_LOG_DIR $GO_AGENT_SYSTEM_PROPERTIES"
+AGENT_STARTUP_ARGS="-Dcruise.console.publish.interval=10 -Xms$AGENT_MEM -Xmx$AGENT_MAX_MEM $GO_AGENT_SYSTEM_PROPERTIES"
 
+if [ "$1" == "service_mode" ]; then
+  AGENT_STARTUP_ARGS="$AGENT_STARTUP_ARGS -Dgocd.agent.log.dir=$GO_AGENT_LOG_DIR"
+fi
 
 if [ "$TMPDIR" != "" ]; then
     AGENT_STARTUP_ARGS="$AGENT_STARTUP_ARGS -Djava.io.tmpdir=$TMPDIR"