From: Keith Packard <keithp@keithp.com>
Date: Fri, 6 May 2016 23:46:57 +0000 (-0700)
Subject: windows: Change install to look for browser in a different place
X-Git-Tag: 1.6.3~2^2^2
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=320e312db36fb6519a0bb1530d79595af18cdc86;ds=sidebyside

windows: Change install to look for browser in a different place

The windows registry is a mystery.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altosui/Instdrv/NSIS/Includes/java.nsh b/altosui/Instdrv/NSIS/Includes/java.nsh
index a457562b..8e0e208a 100644
--- a/altosui/Instdrv/NSIS/Includes/java.nsh
+++ b/altosui/Instdrv/NSIS/Includes/java.nsh
@@ -56,14 +56,29 @@ Function openLinkNewWindow
   Exch
   Push $0
   Exch
- 
-  ReadRegStr $0 HKCR "http\shell\open\command" ""
+
+  ReadRegStr $1 HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.html\UserChoice" "Progid"
+  IfErrors iexplore
+
+  Goto foundbrowser
+iexplore:
+  StrCpy $1 "IE.AssocFile.HTM"
+
+foundbrowser:  
+
+  StrCpy $2 "\shell\open\command"
+
+  StrCpy $3 $1$2
+
+  ReadRegStr $0 HKCR $3 ""
+
 # Get browser path
-    DetailPrint $0
+  DetailPrint $0
+ 
   StrCpy $2 '"'
   StrCpy $1 $0 1
   StrCmp $1 $2 +2 # if path is not enclosed in " look for space as final char
-    StrCpy $2 ' '
+  StrCpy $2 ' '
   StrCpy $3 1
   loop:
     StrCpy $1 $0 1 $3