From 4fb5aa76c3cad6efd6e984db70f4703adc0f666c Mon Sep 17 00:00:00 2001
From: Patrick Reinhart <patrick@reini.net>
Date: Tue, 6 Feb 2024 19:32:13 +0100
Subject: [PATCH] [bugfix] Fixes missplaced izPack config tags

Removed some more missplaced configuration tags after full validation.

Signed-off-by: Patrick Reinhart <patrick@reini.net>
---
 .../src/main/izpack/UnixShortcutSpec.xml         |  3 +--
 exist-installer/src/main/izpack/userInput.xml    | 16 +++++++---------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/exist-installer/src/main/izpack/UnixShortcutSpec.xml b/exist-installer/src/main/izpack/UnixShortcutSpec.xml
index 5340dfb22b1..72eaeea3dc7 100644
--- a/exist-installer/src/main/izpack/UnixShortcutSpec.xml
+++ b/exist-installer/src/main/izpack/UnixShortcutSpec.xml
@@ -38,8 +38,7 @@
             terminal="false"
             programGroup="yes"
             iconFile="$INSTALL_PATH/lib/icon.png"
-            desktop="yes"
-            startupNotify="true"/>
+            desktop="yes"/>
 
     <shortcut name="Uninstall eXist-db"
               description="Uninstall eXist-db"
diff --git a/exist-installer/src/main/izpack/userInput.xml b/exist-installer/src/main/izpack/userInput.xml
index 0d7bac3af3f..fe1397e2e52 100644
--- a/exist-installer/src/main/izpack/userInput.xml
+++ b/exist-installer/src/main/izpack/userInput.xml
@@ -40,11 +40,9 @@
     <panel id="AdminPasswordPanel">
         <!-- field size="1.33" bold="false" txt="Set Admin Password and Configure Memory" align="left"
             type="title"/ -->
-        <field size="1.33" bold="false" txt="Set Admin Password" align="left"
-            type="title"/>
-        <field align="left" variable="adminPasswd" type="password" omitFromAuto="false">
-            <description txt="Please enter a password for user 'admin', the database administrator:"
-                align="left"/>
+        <field size="1.33" bold="false" txt="Set Admin Password" align="left" type="title"/>
+        <field align="left" variable="adminPasswd" type="password">
+            <description txt="Please enter a password for user 'admin', the database administrator:"/>
             <spec>
                 <pwd set="" size="20" txt="Enter password: "/>
                 <pwd set="" size="20" txt="Retype password: "/>
@@ -54,12 +52,12 @@
         </field>
         <!-- field align="bottom" type="divider"/>
         <field type="space"/>
-        <field type="text" variable="MAX_MEMORY">
-          <description align="left" txt="Configure the maximum amount of memory to be used by eXist-db. The recommended minimum memory setting is 1024m. If your machine has enough memory, using 2048m should be sufficient for most data sets. Note: 1200m is usually the limit on 32-bit systems."/>
+        <field align="left" type="text" variable="MAX_MEMORY">
+          <description txt="Configure the maximum amount of memory to be used by eXist-db. The recommended minimum memory setting is 1024m. If your machine has enough memory, using 2048m should be sufficient for most data sets. Note: 1200m is usually the limit on 32-bit systems."/>
           <spec txt="Maximum memory in MB:" size="5" set="2048"/>
         </field>
-        <field type="text" variable="cacheSize">
-            <description align="left" txt="Configure the amount of memory to be reserved for internal caches. If the maximum memory is set above to 1024m, 128m is a good value; for 2048m, use 256m; for 512m, not more than 64mb. Too small settings may lead to bad upload/indexing performance."/>
+        <field align="left" type="text" variable="cacheSize">
+            <description txt="Configure the amount of memory to be reserved for internal caches. If the maximum memory is set above to 1024m, 128m is a good value; for 2048m, use 256m; for 512m, not more than 64mb. Too small settings may lead to bad upload/indexing performance."/>
           <spec txt="Cache memory in MB:" size="5" set="256"/>
         </field -->
     </panel>