CORPRIV-659: Fix DMG installer.

package-demobench.sh

@@ -7,4 +7,4 @@ if [ -z "$JAVA_HOME" ]; then
     exit 1
 fi
 
-exec $DIRNAME/gradlew -PpackageType=dmg javapackage
+exec $DIRNAME/gradlew -PpackageType=dmg javapackage $*

tools/demobench/build.gradle

@@ -141,7 +141,22 @@ task javapackage(dependsOn: 'distZip') {
         }
 
         copy {
-            from("$projectDir/package")
+            from("$projectDir/package") {
+                exclude '**/*.spec'
+                exclude '**/*.sh'
+                exclude '**/*.wsf'
+                exclude '**/*.manifest'
+            }
+            into "$pkg_source/package"
+        }
+
+        copy {
+            from("$projectDir/package") {
+                include '**/*.spec'
+                include '**/*.sh'
+                include '**/*.wsf'
+                include '**/*.manifest'
+            }
             filter {
                 line -> line.replaceAll('@pkg_version@', "$pkg_version")
             }

tools/demobench/package/macosx/DemoBench-post-image.sh

@@ -1,10 +1,11 @@
 if [ -z "$JAVA_HOME" ]; then
-    echo "Please set JAVA_HOME correctly."
+    echo "**** Please set JAVA_HOME correctly."
-else
+    exit 1
-    # Switch to folder containing application.
-    cd ../images/DemoBench.app
-
-    INSTALL_HOME=Contents/PlugIns/Java.runtime/Contents/Home/jre/bin
-    mkdir -p $INSTALL_HOME
-    cp $JAVA_HOME/jre/bin/java $INSTALL_HOME
 fi
+
+# Switch to folder containing application.
+cd ../images/image-*/DemoBench.app
+
+INSTALL_HOME=Contents/PlugIns/Java.runtime/Contents/Home/jre/bin
+mkdir -p $INSTALL_HOME
+cp $JAVA_HOME/jre/bin/java $INSTALL_HOME