From c99458365a8eac122a81073a6c85cc008a3bb87c Mon Sep 17 00:00:00 2001
From: Sami Tikka <sjtikka@gmail.com>
Date: Tue, 13 Dec 2011 23:55:21 +0200
Subject: [PATCH] osx: Improved installer based on recent feedback on #jenkins

1) Installer checks Java is installed before proceeding.
   It also tells how to get Java installed.

2) Installer opens http://localhost:8080 when installation is finished.
---
 changelog.html                       |  5 ++++-
 osx/JenkinsInstaller.pmdoc/index.xml | 16 +++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/changelog.html b/changelog.html
index 4141f8e4d5..739db2ed8e 100644
--- a/changelog.html
+++ b/changelog.html
@@ -62,8 +62,11 @@ Upcoming changes</a>
     Incorrect path delimiter used in ZipArchiver when creating archive on Windows.
     <a href="https://issues.jenkins-ci.org/browse/JENKINS-9942">issue 9942</a>
   <li class="rfe">
-   <tt>.jpi</tt> is now supported as well as <tt>.hpi</tt> as a plugin extension.
+    <tt>.jpi</tt> is now supported as well as <tt>.hpi</tt> as a plugin extension.
     (<a href="https://github.com/jenkinsci/jenkins/pull/331">pull #331</a>)
+  <li class="rfe">
+    OSX installer now checks for the existence of JVM and open the browser in the end.
+    (<a href="https://github.com/jenkinsci/jenkins/pull/329">pull #329</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 
diff --git a/osx/JenkinsInstaller.pmdoc/index.xml b/osx/JenkinsInstaller.pmdoc/index.xml
index 368692baa5..f864802968 100644
--- a/osx/JenkinsInstaller.pmdoc/index.xml
+++ b/osx/JenkinsInstaller.pmdoc/index.xml
@@ -34,11 +34,17 @@
       <resource relative="true" mod="true" type="welcome">docs/JenkinsWelcomePanel.rtf</resource>
     </locale>
   </resources>
+  <requirements>
+    <requirement id="file" operator="eq" value="true">
+      <file>/System/Library/Frameworks/JavaVM.framework/Versions/A/Commands/java</file>
+      <message-title>Java Runtime Not Found</message-title>
+      <message>You need Java runtime to run Jenkins. Open /Applications/Utilities/Java Preferences, install Java and then run this installer again.</message>
+    </requirement>
+  </requirements>
   <flags/>
   <postinstall>
-    <action id="com.apple.packagemaker.actions.showfile">
-      <value>/Users/Shared/Jenkins/Home</value>
-      <type>absolute-path</type>
+    <action id="com.apple.packagemaker.actions.openurl">
+      <value>http://localhost:8080/</value>
     </action>
   </postinstall>
   <extra-files/>
@@ -48,10 +54,10 @@
   <item type="file">04jenkins.xml</item>
   <mod>description</mod>
   <mod>properties.title</mod>
-  <mod>properties.systemDomain</mod>
+  <mod>properties.anywhereDomain</mod>
   <mod>properties.userDomain</mod>
   <mod>properties.customizeOption</mod>
   <mod>extraFiles</mod>
+  <mod>properties.systemDomain</mod>
   <mod>postinstallActions.actions</mod>
-  <mod>properties.anywhereDomain</mod>
 </pkmkdoc>
-- 
GitLab