Changeset 29354

Timestamp:

2014-10-08T19:15:02+13:00 (10 years ago)

Author:

ak19

Message:

Got Expeditee Mac installer working. Installer is read-only, and if a user attempts to run Expeditee from within the installer, an error message is displayed telling them to install it first.

Location:

other-projects/expeditee-release-kits

Files:

• kits/rke/ant-scripts/wrap.xml (modified) (2 diffs)
• shared/mac/Wrapper.app/Contents/MacOS/Expeditee (modified) (1 diff)

other-projects/expeditee-release-kits/kits/rke/ant-scripts/wrap.xml

@@ -184 +184 @@
             <property name="dmg.name" value="${projectname}-${version}${version-extra}-${os.suffix}"/>
             <exec dir="products" executable="hdiutil" failonerror="true">
-                <arg line="create -ov -size ${dmg.size}k -fs HFS+ -volname ${dmg.name} ${dmg.name}.dmg"/>
+                <arg line="create -ov -size ${dmg.size}k -fs HFS+ -volname ${dmg.name} building.dmg"/>
             </exec>
             <!-- mount it -->
             <exec executable="hdiutil" dir="products" failonerror="true">
-                <arg line="attach ${dmg.name}.dmg"/>
+                <arg line="attach building.dmg"/>
             </exec>
             <!-- copy file into it -->
@@ -215 +215 @@
             </exec>
             <!-- format as readonly -->
-            <exec executable="hdiutil" failonerror="true">
-                <arg line="convert ${dmg.name}.dmg -format UDRO -o ${dmg.name}.dmg"/>
+            <exec dir="products" executable="hdiutil" failonerror="true">
+                <arg line="convert building.dmg -format UDRO -o ${dmg.name}.dmg"/>
             </exec>
+            <delete file="products/building.dmg" />
 
         </if></else></if></else></if>

other-projects/expeditee-release-kits/shared/mac/Wrapper.app/Contents/MacOS/Expeditee

@@ -4 +4 @@
 cd "$BINDIR/.."
 BASEDIR="`pwd`"
-[[ -e "$BASEDIR/Resources/jre_bin" ]] && chmod +x "$BASEDIR/Resources/jre_bin" && "$BASEDIR/Resources/jre_bin" -o"$BASEDIR/Resources" && rm "$BASEDIR/Resources/jre_bin"
-"$BASEDIR/Resources/jre/bin/java" -jar "$BASEDIR/Resources/Expeditee.jar"
+if [[ -w $BASEDIR ]]; then
+    [[ -e "$BASEDIR/Resources/jre_bin" ]] && chmod +x "$BASEDIR/Resources/jre_bin" && "$BASEDIR/Resources/jre_bin" -o"$BASEDIR/Resources" && rm "$BASEDIR/Resources/jre_bin"
+    "$BASEDIR/Resources/jre/bin/java" -jar "$BASEDIR/Resources/Expeditee.jar"
+else
+    # display error message
+    # see: https://developer.apple.com/library/mac/documentation/AppleScript/Conceptual/AppleScriptLangGuide/reference/ASLR_cmds.html#//apple_ref/doc/uid/TP40000983-CH216-SW11
+    osascript -e 'tell app "System Events" to display alert "To install Expeditee, drag and drop the app wherever you would like to install it (such as the Applications folder or your desktop).\nOnce Expeditee is installed, you can close this installer window and run Expeditee by double-clicking on the installed app" as warning giving up after 10'
+fi