From 38e4850ae080111d0bff70d702faa26ca17a6d02 Mon Sep 17 00:00:00 2001
From: Hari Sekhon <harisekhon@gmail.com>
Date: Sun, 29 Mar 2020 04:10:48 +0100
Subject: [PATCH] updated jenkins.sh

---
 jenkins.sh | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/jenkins.sh b/jenkins.sh
index 8b25d5b0..6cdef146 100755
--- a/jenkins.sh
+++ b/jenkins.sh
@@ -63,10 +63,16 @@ echo "Booting Jenkins docker:"
 docker-compose -f "$config" "$action" $opts "$@"
 echo
 
-when_url_content "$server" '(?i:jenkins|hudson)'
-echo
+when_jenkins_up(){
+    when_url_content "$server" '(?i:jenkins|hudson)'
+    echo
+}
+
+when_jenkins_up
 
 echo "Installing plugins"
+# would be slow to do this via jenkins-cli
+# sed 's/#.*//; s/:.*//; /^[[:space:]]*$/d' setup/jenkins-plugins.txt | while read plugin; do jenkins_cli.sh install-plugin "$plugin"; done
 docker-compose -f "$config" exec -T jenkins-server /usr/local/bin/install-plugins.sh < "$plugins_txt"
 echo
 
@@ -81,6 +87,11 @@ Jenkins Login password:  $password
 EOF
 fi
 
+#echo "Safe-Restarting Jenkins to pick up plugins:"
+#"$cli" safe-restart
+
+#when_jenkins_up
+
 echo "Validating Jenkinsfile"
 "$cli" declarative-linter < "$Jenkinsfile"
 echo