# HG changeset patch
# User John Donoghue
# Date 1533751052 14400
# Node ID 0c6d7d14a6158ce34a9cd4317711572aa12b1a8f
# Parent  34d290388ee99dab56522d019c3d982dc7d2ca5f
* tools/makeinst-script.sh.in: Set default option page values (Bug #54457)

diff -r 34d290388ee9 -r 0c6d7d14a615 tools/makeinst-script.sh.in
--- a/tools/makeinst-script.sh.in	Tue Aug 07 09:32:42 2018 -0400
+++ b/tools/makeinst-script.sh.in	Wed Aug 08 13:57:32 2018 -0400
@@ -163,15 +163,15 @@
 
   \${NSD_CreateCheckBox} 0 0 100% 12u "Install for all users"
   Pop \$InstallAllUsersCtrl
-  \${NSD_SetState} \$InstallAllUsersCtrl \${BST_CHECKED}
+  \${NSD_SetState} \$InstallAllUsersCtrl \$InstallAllUsers
 
   \${NSD_CreateCheckBox} 0 20 100% 12u "Create desktop shortcuts"
   Pop \$InstallShortcutsCtrl
-  \${NSD_SetState} \$InstallShortcutsCtrl \${BST_CHECKED}
+  \${NSD_SetState} \$InstallShortcutsCtrl \$InstallShortcuts
 
   \${NSD_CreateCheckBox} 0 40 100% 12u "Register .m file type with Octave"
   Pop \$RegisterOctaveFileTypeCtrl
-  \${NSD_SetState} \$RegisterOctaveFileTypeCtrl \${BST_CHECKED}
+  \${NSD_SetState} \$RegisterOctaveFileTypeCtrl \$RegisterOctaveFileType
 
   \${NSD_CreateLabel} 0 70 110u 12u "BLAS library implementation:"
   Pop \$0
@@ -207,6 +207,12 @@
 ######################################################################
 
 Function .onInit
+  ; set default options
+  StrCpy \$InstallAllUsers \${BST_CHECKED}
+  StrCpy \$InstallShortcuts \${BST_CHECKED}
+  StrCpy \$RegisterOctaveFileType  \${BST_CHECKED}
+  StrCpy \$InstallBlasLib 0
+
   Call CheckWinVer
   Call CheckCurrVersion
   \${If} @ENABLE_JAVA@ == yes
@@ -217,7 +223,6 @@
 
 ; file section
 Section "MainFiles"
-
   ; set context based on whether installing for user or all
   \${If} \$InstallAllUsers == \${BST_CHECKED}
     SetShellVarContext all