X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2Faltos-windows.nsi.in;h=6d4dabfa86ba8338c7514bfcf8032ef145e5d8d4;hp=11c1dc0700d0682dae16f1833258c8287ed667b1;hb=2c4ebe9b4b392531cd1a5bbafc4ddc38a9391af5;hpb=445d61c3810154193aebbf0f08f075ac8e107baf

diff --git a/altosui/altos-windows.nsi.in b/altosui/altos-windows.nsi.in
index 11c1dc07..6d4dabfa 100644
--- a/altosui/altos-windows.nsi.in
+++ b/altosui/altos-windows.nsi.in
@@ -108,7 +108,7 @@ Section "${REG_NAME} Application"
 
 	File "../icon/${WIN_APP_ICON}"
 
-	CreateShortCut "$SMPROGRAMS\${REG_NAME}.lnk" "$SYSDIR\javaw.exe" "-jar ${FAT_NAME}" "$INSTDIR\${WIN_APP_ICON}"
+	CreateShortCut "$SMPROGRAMS\${REG_NAME}.lnk" "$INSTDIR\${FAT_NAME}" "" "$INSTDIR\${WIN_APP_ICON}"
 SectionEnd
 
 Section "${REG_NAME} Desktop Shortcut"
@@ -126,6 +126,7 @@ Section "Firmware"
 	File "../src/telemini-v1.0/telemini-v1.0-${VERSION}.ihx"
 	File "../src/telegps-v1.0/telegps-v1.0-${VERSION}.ihx"
 	File "../src/teledongle-v0.2/teledongle-v0.2-${VERSION}.ihx"
+	File "../src/teledongle-v3.0/teledongle-v3.0-${VERSION}.ihx"
 	File "../src/telebt-v1.0/telebt-v1.0-${VERSION}.ihx"
 	File "../src/telemega-v1.0/telemega-v1.0-${VERSION}.ihx"
 	File "../src/easymini-v1.0/easymini-v1.0-${VERSION}.ihx"
@@ -164,13 +165,15 @@ Section "File Associations"
 	DeleteRegKey   HKCR ".telem\${PROG_ID_EEPROM}"
 	DeleteRegValue HKCR ".telem\OpenWithProgids" "${PROG_ID_EEPROM}"
 
+	SearchPath $1 "javaw.exe"
+
 	; .eeprom elements
 
 	WriteRegStr HKCR "${PROG_ID_EEPROM}"		""				"Altus Metrum Log File"
 	WriteRegStr HKCR "${PROG_ID_EEPROM}"		"FriendlyTypeName"		"Altus Metrum Log File"
 	WriteRegStr HKCR "${PROG_ID_EEPROM}\CurVer"	""				"${PROG_ID_EEPROM}"
 	WriteRegStr HKCR "${PROG_ID_EEPROM}\DefaultIcon" ""				'"$INSTDIR\${WIN_EEPROM_EXE}",-101'
-  WriteRegExpandStr HKCR "${PROG_ID_EEPROM}\shell\open\command" ""			'"%SYSTEMROOT%\System32\javaw.exe" -Djava.library.path="$INSTDIR" -jar "$INSTDIR\${FAT_NAME}" "%1"'
+  WriteRegExpandStr HKCR "${PROG_ID_EEPROM}\shell\open\command" ""			'"$1" -Djava.library.path="$INSTDIR" -jar "$INSTDIR\${FAT_NAME}" "%1"'
 
 	WriteRegStr HKCR ".eeprom"			""				"${PROG_ID_EEPROM}"
 	WriteRegStr HKCR ".eeprom"			"PerceivedType"			"Altus Metrum Log File"
@@ -185,7 +188,7 @@ Section "File Associations"
 	WriteRegStr HKCR "${PROG_ID_TELEM}"		"FriendlyTypeName"		"Altus Metrum Telemetry File"
 	WriteRegStr HKCR "${PROG_ID_TELEM}\CurVer"	""				"${PROG_ID_TELEM}"
 	WriteRegStr HKCR "${PROG_ID_TELEM}\DefaultIcon" ""				'"$INSTDIR\${WIN_TELEM_EXE}",-101'
-  WriteRegExpandStr HKCR "${PROG_ID_TELEM}\shell\open\command" ""			'"%SYSTEMROOT%\System32\javaw.exe" -Djava.library.path="$INSTDIR" -jar "$INSTDIR\${FAT_NAME}" "%1"'
+  WriteRegExpandStr HKCR "${PROG_ID_TELEM}\shell\open\command" ""			'"$1" -Djava.library.path="$INSTDIR" -jar "$INSTDIR\${FAT_NAME}" "%1"'
 
 	WriteRegStr HKCR ".telem"			""				"${PROG_ID_TELEM}"
 	WriteRegStr HKCR ".telem"			"PerceivedType"			"Altus Metrum Telemetry File"