comparison tools/makeinst-script.sh.in @ 6940:c9c411f5db86

maint: Merge release to default.
author Markus Mützel <markus.muetzel@gmx.de>
date Sat, 28 Oct 2023 17:56:22 +0200
parents f04699caf98e 4f25eb25a80b
children fb42442fac08
comparison
equal deleted inserted replaced
6938:077c0a4d4016 6940:c9c411f5db86
167 !define MUI_PAGE_CUSTOMFUNCTION_LEAVE CheckPrevInstallAndDest 167 !define MUI_PAGE_CUSTOMFUNCTION_LEAVE CheckPrevInstallAndDest
168 !insertmacro MUI_PAGE_DIRECTORY 168 !insertmacro MUI_PAGE_DIRECTORY
169 169
170 !insertmacro MUI_PAGE_INSTFILES 170 !insertmacro MUI_PAGE_INSTFILES
171 171
172 !define MUI_PAGE_CUSTOMFUNCTION_SHOW CheckConsole
172 !define MUI_FINISHPAGE_RUN "\$WINDIR\\explorer.exe" 173 !define MUI_FINISHPAGE_RUN "\$WINDIR\\explorer.exe"
173 !define MUI_FINISHPAGE_RUN_PARAMETERS "\$INSTDIR\\\${MAIN_APP_EXE}" 174 !define MUI_FINISHPAGE_RUN_PARAMETERS "\$INSTDIR\\\${MAIN_APP_EXE}"
174 !define MUI_FINISHPAGE_SHOWREADME "\$INSTDIR\\README.html" 175 !define MUI_FINISHPAGE_SHOWREADME "\$INSTDIR\\README.html"
175 !insertmacro MUI_PAGE_FINISH 176 !insertmacro MUI_PAGE_FINISH
176 177
1129 1130
1130 inst_end: 1131 inst_end:
1131 1132
1132 FunctionEnd 1133 FunctionEnd
1133 1134
1135 ; Function to check Console Settings and show a warn
1136 Function CheckConsole
1137 Push \$R0
1138 Push \$R1
1139
1140 ClearErrors
1141
1142 ReadRegStr \$R1 HKCU "Console\\%%Startup" "DelegationConsole"
1143 IfErrors ignore_console 0
1144
1145 StrCmp \$R1 "" ignore_console 0
1146 # already set for console host
1147 StrCmp \$R1 "{B23D10C0-E52E-411E-9D5B-C09FDF709C7D}" ignore_console 0
1148
1149 # display message
1150 MessageBox MB_ICONEXCLAMATION|MB_YESNO|MB_DEFBUTTON2 "Using Octave with the Windows Terminal app could lead to issues with the command window. Please, set the default to the “Windows Console Host”.$\r$\n$\r$\nWould you like to get instructions on how to change the default console?" /SD IDNO IDNO ignore_console
1151
1152 ExecShell open "https://devblogs.microsoft.com/commandline/windows-terminal-as-your-default-command-line-experience/"
1153
1154 ignore_console:
1155 Pop \$R1
1156 Pop \$R0
1157 FunctionEnd
1158
1134 ; Function to check Java Runtime Environment 1159 ; Function to check Java Runtime Environment
1135 Function CheckJRE 1160 Function CheckJRE
1136 ; looks in: 1161 ; looks in:
1137 ; 1 - JAVA_HOME environment variable 1162 ; 1 - JAVA_HOME environment variable
1138 ; 2 - the registry 1163 ; 2 - the registry