From 562e17935a52ec8ebb1dd3f2d2e92604a051ea1c Mon Sep 17 00:00:00 2001 From: JoePfeiffer Date: Sat, 11 Jun 2022 17:53:16 -0600 Subject: [PATCH] Revised installer configuration to enable desktop icon and file associations. The major change is it turns out you need to do the file installation before trying to create the integrations. --- install4j/22.xx/openrocket-22.xx.install4j | 112 +++++++-------------- 1 file changed, 37 insertions(+), 75 deletions(-) diff --git a/install4j/22.xx/openrocket-22.xx.install4j b/install4j/22.xx/openrocket-22.xx.install4j index 3a15e2134..d19b835af 100644 --- a/install4j/22.xx/openrocket-22.xx.install4j +++ b/install4j/22.xx/openrocket-22.xx.install4j @@ -1,6 +1,6 @@ - + @@ -175,16 +175,6 @@ return console.askOkCancel(message, true); !context.getBooleanVariable("sys.confirmedUpdateInstallation") - - - - - sys.installationDir - - - context.getVariable("sys.responseFile") == null - - @@ -211,30 +201,40 @@ return console.askOkCancel(message, true); - + - + - ${i18n:SelectComponentsLabel2} + ${i18n:SelectAssociationsLabel} - !context.isConsole() - + - selectionChangedScript + showSelectionButtons + selectionButtonPosition - + + + + + + + ${form:confirmationMessage} + + !context.isConsole() + + ${i18n:CreateDesktopIcon} createDesktopLinkAction - + ${i18n:AddToDock} @@ -244,21 +244,17 @@ return console.askOkCancel(message, true); - + - + + - - - OpenRocket - - + ${i18n:UninstallerMenuEntry(${compiler:sys.fullName})} - context.getBooleanVariable("addToDockAction") + !context.getBooleanVariable("sys.programGroupDisabled") - + - Education;Science OpenRocket @@ -278,7 +274,17 @@ return console.askOkCancel(message, true); !context.getBooleanVariable("sys.programGroupDisabled") - + + + + + OpenRocket + + + + context.getBooleanVariable("addToDockAction") + + OpenRocket Model Rocket Simulator @@ -286,7 +292,6 @@ return console.askOkCancel(message, true); OpenRocket - ${compiler:sys.fullName} @@ -301,7 +306,7 @@ return console.askOkCancel(message, true); context.getBooleanVariable("createDesktopLinkAction") - + OpenRocket Design ork @@ -326,49 +331,6 @@ return console.askOkCancel(message, true); - - - - - ${i18n:SelectAssociationsLabel} - - - - - - - - - selectionButtonPosition - showSelectionButtons - - - - - ${i18n:CreateDesktopIcon} - - createDesktopLinkAction - - - - - ${i18n:AddToDock} - - addToDockAction - - Util.isMacOS() - - - - - - - - - ${i18n:UninstallerMenuEntry(${compiler:sys.fullName})} - - !context.getBooleanVariable("sys.programGroupDisabled") - ${compiler:sys.fullName} ${compiler:sys.version}