Changeset 30103 for main/trunk

Timestamp:

2015-08-12T21:02:48+12:00 (9 years ago)

Author:

ak19

Message:

Mounted drive's .app may not have writable contents. Instead, we make no assumptions about writeability. The jre_bin is now copied into /tmp and made writeable there before being extracted.

File:

• main/trunk/release-kits/shared/mac/Wrapper.app/Contents/MacOS/greenstone (modified) (1 diff)

main/trunk/release-kits/shared/mac/Wrapper.app/Contents/MacOS/greenstone

@@ -17 +17 @@
 
 if [[ -e "$BASEDIR/Resources/Java/jre_bin" ]]; then
-  if [[ -w "$BASEDIR/Resources/Java" ]]; then
-     chmod +x "$BASEDIR/Resources/Java/jre_bin" && "$BASEDIR/Resources/Java/jre_bin" -o"/tmp" #&& rm "$BASEDIR/Resources/Java/jre_bin"
+     cp "$BASEDIR/Resources/Java/jre_bin" /tmp/. && chmod +x "/tmp/jre_bin" && "/tmp/jre_bin" -o"/tmp" #&& rm "/tmp/jre_bin"
 
      if [[ -e "/tmp/jre.tar" ]]; then
-
+        rm /tmp/jre_bin
         # get the GS jar installer's name and run it
         cd "$BASEDIR/Resources/Java/"
         gs_installer=`ls Greenstone-*-MacOS-intel.jar`
-        tar -xvf /tmp/jre.tar -C /tmp && "/tmp/jre/bin/java" -jar "$gs_installer"
-        rm /tmp/jre.tar         
+        tar -xvf /tmp/jre.tar -C /tmp && rm /tmp/jre.tar && "/tmp/jre/bin/java" -jar "$gs_installer"
 
-     else 
+     else
+       # Issues extracting the jre.tar into /tmp (maybe we couldn't even copy it there) - 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 \"Unable to unpack jre into /tmp folder\" as warning giving up after 10"   
+       # exit
      fi
-  else
-  # Installation directory not writable - 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 Greenstone, double-click on the installer app" as warning giving up after 10'
-     exit
-  fi
 fi