summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2016-05-06 16:46:57 -0700
committerKeith Packard <keithp@keithp.com>2016-05-06 16:46:57 -0700
commit320e312db36fb6519a0bb1530d79595af18cdc86 (patch)
treeb17b669eb1af980014231e8ee7c27ebc43a70d91
parente0081f7ba6fc9f1e4484d3e291fd30065ad5b620 (diff)
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>
-rw-r--r--altosui/Instdrv/NSIS/Includes/java.nsh23
1 files changed, 19 insertions, 4 deletions
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