JAL-3611 added quotation marks for appdir argument install4j uses to invoke getdown...

[jalview.git] / utils / install4j / install4j8_template.install4j

diff --git a/utils/install4j/install4j8_template.install4j b/utils/install4j/install4j8_template.install4j
index eb585d9..d540935 100644 (file)
--- a/utils/install4j/install4j8_template.install4j
+++ b/utils/install4j/install4j8_template.install4j
@@ -127,7 +127,7 @@
           <versionLine x="85" y="109" text="version ${compiler:sys.version}" />
         </text>
       </splashScreen>
-      <java mainClass="com.threerings.getdown.launcher.GetdownApp" vmParameters="-Dinstaller_template_version=${compiler:INSTALLER_TEMPLATE_VERSION}" arguments="${launcher:sys.launcherDirectory} jalview">
+      <java mainClass="com.threerings.getdown.launcher.GetdownApp" vmParameters="-Dinstaller_template_version=${compiler:INSTALLER_TEMPLATE_VERSION}" arguments="&quot;${launcher:sys.launcherDirectory}&quot; jalview">
         <classPath>
           <archive location="getdown-launcher.jar" />
           <archive location="${compiler:GETDOWN_INSTALL_DIR}/getdown-launcher.jar" failOnError="false" />
@@ -684,7 +684,7 @@ return console.askYesNo(message, true);
               </action>
               <action id="1525" beanClass="com.install4j.runtime.beans.actions.files.DeleteFileAction" actionElevationType="elevated" rollbackBarrierExitCode="0">
                 <serializedBean>
-                  <property name="files" type="array" class="java.io.File" length="32">
+                  <property name="files" type="array" class="java.io.File" length="36">
                     <element index="0">
                       <object class="java.io.File">
                         <string>jre</string>
@@ -702,117 +702,117 @@ return console.askYesNo(message, true);
                     </element>
                     <element index="3">
                       <object class="java.io.File">
-                        <string>${compiler:GETDOWN_DIST_DIR}</string>
+                        <string>getdown-launcher.jar</string>
                       </object>
                     </element>
                     <element index="4">
                       <object class="java.io.File">
-                        <string>${compiler:GETDOWN_ALT_DIR}</string>
+                        <string>getdown-launcher-old.jar</string>
                       </object>
                     </element>
                     <element index="5">
                       <object class="java.io.File">
-                        <string>${compiler:GETDOWN_RESOURCE_DIR}</string>
+                        <string>getdown-launcher-new.jar</string>
                       </object>
                     </element>
                     <element index="6">
                       <object class="java.io.File">
-                        <string>getdown-launcher.jar</string>
+                        <string>gettingdown.lock</string>
                       </object>
                     </element>
                     <element index="7">
                       <object class="java.io.File">
-                        <string>getdown-launcher-old.jar</string>
+                        <string>jre.zip</string>
                       </object>
                     </element>
                     <element index="8">
                       <object class="java.io.File">
-                        <string>getdown-launcher-new.jar</string>
+                        <string>digest.txt</string>
                       </object>
                     </element>
                     <element index="9">
                       <object class="java.io.File">
-                        <string>*.jarv</string>
+                        <string>digest2.txt</string>
                       </object>
                     </element>
                     <element index="10">
                       <object class="java.io.File">
-                        <string>gettingdown.lock</string>
+                        <string>getdown-launcher.jarv</string>
                       </object>
                     </element>
                     <element index="11">
                       <object class="java.io.File">
-                        <string>*.log</string>
+                        <string>getdown-launcher-new.jarv</string>
                       </object>
                     </element>
                     <element index="12">
                       <object class="java.io.File">
-                        <string>*.txt</string>
+                        <string>launcher.log</string>
                       </object>
                     </element>
                     <element index="13">
                       <object class="java.io.File">
-                        <string>*_new</string>
+                        <string>proxy.txt</string>
                       </object>
                     </element>
                     <element index="14">
                       <object class="java.io.File">
-                        <string>digest.txt</string>
+                        <string>build_properties</string>
                       </object>
                     </element>
                     <element index="15">
                       <object class="java.io.File">
-                        <string>digest2.txt</string>
+                        <string>channel_launch*.jvl</string>
                       </object>
                     </element>
                     <element index="16">
                       <object class="java.io.File">
-                        <string>getdown-launcher.jarv</string>
+                        <string>jalview*.jvl</string>
                       </object>
                     </element>
                     <element index="17">
                       <object class="java.io.File">
-                        <string>getdown-launcher-new.jarv</string>
+                        <string>*.jarv</string>
                       </object>
                     </element>
                     <element index="18">
                       <object class="java.io.File">
-                        <string>channel_launch*.jvl</string>
+                        <string>*.log</string>
                       </object>
                     </element>
                     <element index="19">
                       <object class="java.io.File">
-                        <string>launcher.log</string>
+                        <string>*.txt</string>
                       </object>
                     </element>
                     <element index="20">
                       <object class="java.io.File">
-                        <string>proxy.txt</string>
+                        <string>*_new</string>
                       </object>
                     </element>
                     <element index="21">
                       <object class="java.io.File">
-                        <string>META-INF</string>
+                        <string>hs_err_*.*</string>
                       </object>
                     </element>
                     <element index="22">
                       <object class="java.io.File">
-                        <string>install/getdown-launcher.jar</string>
+                        <string>${compiler:GETDOWN_DIST_DIR}</string>
                       </object>
                     </element>
                     <element index="23">
                       <object class="java.io.File">
-                        <string>install/getdown.txt</string>
+                        <string>${compiler:GETDOWN_ALT_DIR}</string>
                       </object>
                     </element>
                     <element index="24">
                       <object class="java.io.File">
-                        <string>install/build_properties</string>
+                        <string>${compiler:GETDOWN_RESOURCE_DIR}</string>
                       </object>
                     </element>
                     <element index="25">
                       <object class="java.io.File">
-                        <string>build_properties</string>
+                        <string>META-INF</string>
                       </object>
                     </element>
                     <element index="26">
@@ -822,27 +822,47 @@ return console.askYesNo(message, true);
                     </element>
                     <element index="27">
                       <object class="java.io.File">
-                        <string>dist</string>
+                        <string>resource</string>
                       </object>
                     </element>
                     <element index="28">
                       <object class="java.io.File">
-                        <string>release</string>
+                        <string>dist</string>
                       </object>
                     </element>
                     <element index="29">
                       <object class="java.io.File">
-                        <string>alt</string>
+                        <string>release</string>
                       </object>
                     </element>
                     <element index="30">
                       <object class="java.io.File">
-                        <string>resource</string>
+                        <string>alt</string>
                       </object>
                     </element>
                     <element index="31">
                       <object class="java.io.File">
-                        <string>hs_err_*.*</string>
+                        <string>dev</string>
+                      </object>
+                    </element>
+                    <element index="32">
+                      <object class="java.io.File">
+                        <string>build</string>
+                      </object>
+                    </element>
+                    <element index="33">
+                      <object class="java.io.File">
+                        <string>alt_*</string>
+                      </object>
+                    </element>
+                    <element index="34">
+                      <object class="java.io.File">
+                        <string>dev_*</string>
+                      </object>
+                    </element>
+                    <element index="35">
+                      <object class="java.io.File">
+                        <string>build_*</string>
                       </object>
                     </element>
                   </property>