Merge "jenkins-jnlp-connect.sh: monit config file was always updated"
authorAric Gardner <agardner@linuxfoundation.org>
Wed, 23 Mar 2016 13:17:07 +0000 (13:17 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 23 Mar 2016 13:17:07 +0000 (13:17 +0000)
utils/jenkins-jnlp-connect.sh

index ec31a4a..10ac50b 100755 (executable)
@@ -100,8 +100,8 @@ if [[ -f $monitconfdir/jenkins ]]; then
   #test for diff
   if [[ "$(diff $monitconfdir/jenkins <(echo "\
 check process jenkins with pidfile /var/run/$jenkinsuser/jenkins_jnlp_pid
-start program = \"usr/bin/sudo -u $jenkinsuser /bin/bash -c 'cd $dir; export started_monit=true; $0 $@'\"
-stop program = \" /bin/bash -c '/bin/kill \$(/bin/cat /var/run/$jenkinsuser/jenkins_jnlp_pid)'\"\
+start program = \"/usr/bin/sudo -u $jenkinsuser /bin/bash -c 'cd $dir; export started_monit=true; $0 $@'\"
+stop program = \"/bin/bash -c '/bin/kill \$(/bin/cat /var/run/$jenkinsuser/jenkins_jnlp_pid)'\"\
 ") )" ]]; then
     echo "Updating monit config..."
     makemonit $@