From 31c5bddf9b6b8805583a7c46c810cc035f2b370c Mon Sep 17 00:00:00 2001
From: Pete Brown <pete.brown@powerhrg.com>
Date: Mon, 3 Jul 2017 16:18:11 -0400
Subject: [PATCH] Bring start-slave script on MacOS inline with other OSes

The start-slave script was not using the env vars properly
This generates the start up options from the env vars in jenkins-slave
---
 manifests/slave.pp           |  1 +
 templates/start-slave.sh.erb | 68 ++++++++++++++++++++++++++++++++++--
 2 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/manifests/slave.pp b/manifests/slave.pp
index 27120ee46..c38b79dc5 100644
--- a/manifests/slave.pp
+++ b/manifests/slave.pp
@@ -275,6 +275,7 @@
         mode    => '0755',
         owner   => 'root',
         group   => 'wheel',
+        notify  => Service['jenkins-slave'],
       }
 
       file { '/Library/LaunchDaemons/org.jenkins-ci.slave.jnlp.plist':
diff --git a/templates/start-slave.sh.erb b/templates/start-slave.sh.erb
index ebec07754..6a55c09b3 100644
--- a/templates/start-slave.sh.erb
+++ b/templates/start-slave.sh.erb
@@ -1,4 +1,68 @@
 #!/usr/bin/env bash
 
-source <%= @defaults_location %>/jenkins-slave 
-java -jar <%= @slave_home %>/<%= @client_jar %> $JENKINS_SLAVE_ARGS
+source <%= @defaults_location %>/jenkins-slave
+
+# mandatory input vars
+[[ -x "$JAVA" ]] || (fail "$JAVA is not executable")
+[[ -f "$JENKINS_SLAVE_JAR" ]] || (fail "$JENKINS_SLAVE_JAR not accessible")
+
+SLAVE_ARGS=()
+
+[[ -n "$JAVA_ARGS" ]] &&
+  SLAVE_ARGS+=("$JAVA_ARGS")
+
+SLAVE_ARGS+=(-jar "$JENKINS_SLAVE_JAR")
+
+[[ -n "$JENKINS_SLAVE_MODE" ]] &&
+  SLAVE_ARGS+=(-mode "$JENKINS_SLAVE_MODE")
+
+[[ -n "$EXECUTORS" ]] &&
+  SLAVE_ARGS+=(-executors "$EXECUTORS")
+
+[[ -n "$JENKINS_USERNAME" ]] &&
+  SLAVE_ARGS+=(-username "$JENKINS_USERNAME")
+
+[[ -n "$JENKINS_PASSWORD" ]] &&
+  export JENKINS_PASSWORD &&
+  SLAVE_ARGS+=(-passwordEnvVariable JENKINS_PASSWORD)
+
+[[ -n "$CLIENT_NAME" ]] &&
+  SLAVE_ARGS+=(-name "$CLIENT_NAME")
+
+[[ -n "$MASTER_URL" ]] &&
+  SLAVE_ARGS+=(-master "$MASTER_URL")
+
+if [ -n "$LABELS" ]; then
+  for l in $LABELS; do
+    SLAVE_ARGS+=(-labels "$l")
+  done
+fi
+
+[[ -n "$FSROOT" ]] &&
+  SLAVE_ARGS+=(-fsroot "$FSROOT")
+
+[[ "$DISABLE_CLIENTS_UNIQUE_ID" == true ]] &&
+  SLAVE_ARGS+=(-disableClientsUniqueId)
+
+[[ "$DISABLE_SSL_VERIFICATION" == true ]] &&
+  SLAVE_ARGS+=(-disableSslVerification)
+
+[[ "$DELETE_EXISTING_CLIENTS" == true ]] &&
+  SLAVE_ARGS+=(-deleteExistingClients)
+
+[[ -n "$DESCRIPTION" ]] &&
+ SLAVE_ARGS+=(-description "$DESCRIPTION")
+
+[[ -n "$AUTO_DISCOVERY_ADDRESS" ]] &&
+  SLAVE_ARGS+=(-autoDiscoveryAddress "$AUTO_DISCOVERY_ADDRESS")
+
+if [ -n "$TOOL_LOCATIONS" ]; then
+  for t in $TOOL_LOCATIONS; do
+    SLAVE_ARGS+=(--toolLocation "$t")
+  done
+fi
+
+[[ -n "$OTHER_ARGS" ]] &&
+  SLAVE_ARGS+=("$OTHER_ARGS")
+
+$JAVA "${SLAVE_ARGS[@]}"