X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2Faltos-windows.nsi.in;fp=altosui%2Faltos-windows.nsi.in;h=2f22a4a372c24f58d702a04d0e5c16adbddefebe;hp=6d4dabfa86ba8338c7514bfcf8032ef145e5d8d4;hb=643c2fb03833d658320f476ef731bbb06fe3cc31;hpb=e41786fb384892961a6547e17812a24314ce9623

diff --git a/altosui/altos-windows.nsi.in b/altosui/altos-windows.nsi.in
index 6d4dabfa..2f22a4a3 100644
--- a/altosui/altos-windows.nsi.in
+++ b/altosui/altos-windows.nsi.in
@@ -103,16 +103,17 @@ Section "${REG_NAME} Application"
 	File "freetts.jar"
 	File "jfreechart.jar"
 	File "jcommon.jar"
+	File "../icon/${WIN_APP_EXE}"
 
 	File "*.dll"
 
 	File "../icon/${WIN_APP_ICON}"
 
-	CreateShortCut "$SMPROGRAMS\${REG_NAME}.lnk" "$INSTDIR\${FAT_NAME}" "" "$INSTDIR\${WIN_APP_ICON}"
+	CreateShortCut "$SMPROGRAMS\${REG_NAME}.lnk" "$INSTDIR\${WIN_APP_EXE}" "" "$INSTDIR\${WIN_APP_ICON}"
 SectionEnd
 
 Section "${REG_NAME} Desktop Shortcut"
-	CreateShortCut "$DESKTOP\${REG_NAME}.lnk" "$INSTDIR\${FAT_NAME}"  "" "$INSTDIR\${WIN_APP_ICON}"
+	CreateShortCut "$DESKTOP\${REG_NAME}.lnk" "$INSTDIR\${WIN_APP_EXE}"  "" "$INSTDIR\${WIN_APP_ICON}"
 SectionEnd
 
 Section "Firmware"
@@ -153,7 +154,6 @@ Section "File Associations"
 
 	SetOutPath $INSTDIR
 
-	File "../icon/${WIN_APP_EXE}"
 	File "../icon/${WIN_TELEM_EXE}"
 	File "../icon/${WIN_EEPROM_EXE}"
 
@@ -165,15 +165,13 @@ 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" ""			'"$1" -Djava.library.path="$INSTDIR" -jar "$INSTDIR\${FAT_NAME}" "%1"'
+  WriteRegExpandStr HKCR "${PROG_ID_EEPROM}\shell\open\command" ""			'"$INSTDIR\${WIN_APP_EXE}" "%1"'
 
 	WriteRegStr HKCR ".eeprom"			""				"${PROG_ID_EEPROM}"
 	WriteRegStr HKCR ".eeprom"			"PerceivedType"			"Altus Metrum Log File"
@@ -188,7 +186,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" ""			'"$1" -Djava.library.path="$INSTDIR" -jar "$INSTDIR\${FAT_NAME}" "%1"'
+  WriteRegExpandStr HKCR "${PROG_ID_TELEM}\shell\open\command" ""			'"$INSTDIR\${WIN_APP_EXE}" "%1"'
 
 	WriteRegStr HKCR ".telem"			""				"${PROG_ID_TELEM}"
 	WriteRegStr HKCR ".telem"			"PerceivedType"			"Altus Metrum Telemetry File"