micropeak: Fix file association registry install on Windows

[fw/altos] / micropeak / micropeak-windows.nsi.in

diff --git a/micropeak/micropeak-windows.nsi.in b/micropeak/micropeak-windows.nsi.in
index 848523b03d79fc34d6b9f5e58a0c202be43235c5..baa153e94aae45f5330db1e01f2a14336acc7314 100644 (file)
--- a/micropeak/micropeak-windows.nsi.in
+++ b/micropeak/micropeak-windows.nsi.in
@@ -86,7 +86,7 @@ Section "${REG_NAME} Application"
 
        File "../icon/${WIN_APP_ICON}"
 
 
        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"
 SectionEnd
 
 Section "${REG_NAME} Desktop Shortcut"


@@ -102,11 +102,15 @@ SectionEnd
 
 Section "File Associations"
 
 
 Section "File Associations"
 

+       ${DisableX64FSRedirection}
+

        SetOutPath $INSTDIR
 
        File "../icon/${WIN_APP_EXE}"
        File "../icon/${WIN_MPD_EXE}"
 
        SetOutPath $INSTDIR
 
        File "../icon/${WIN_APP_EXE}"
        File "../icon/${WIN_MPD_EXE}"
 

+       SearchPath $1 "javaw.exe"
+

        ; application elements
        
        DeleteRegKey HKCR "${PROG_ID}"
        ; application elements
        
        DeleteRegKey HKCR "${PROG_ID}"


@@ -116,7 +120,7 @@ Section "File Associations"
        WriteRegStr HKCR "${PROG_ID_MPD}"               "FriendlyTypeName"              "MicroPeak Data File"
        WriteRegStr HKCR "${PROG_ID_MPD}\CurVer"        ""                              "${PROG_ID_MPD}"
        WriteRegStr HKCR "${PROG_ID_MPD}\DefaultIcon"   ""                              '"$INSTDIR\${WIN_MPD_EXE}",-101'
        WriteRegStr HKCR "${PROG_ID_MPD}"               "FriendlyTypeName"              "MicroPeak Data File"
        WriteRegStr HKCR "${PROG_ID_MPD}\CurVer"        ""                              "${PROG_ID_MPD}"
        WriteRegStr HKCR "${PROG_ID_MPD}\DefaultIcon"   ""                              '"$INSTDIR\${WIN_MPD_EXE}",-101'

-  WriteRegExpandStr HKCR "${PROG_ID_MPD}\shell\play\command" ""                                '"%SYSTEMROOT%\System32\javaw.exe" -Djava.library.path="$INSTDIR" -jar "$INSTDIR\${FAT_NAME}" "%1"'
+  WriteRegExpandStr HKCR "${PROG_ID_MPD}\shell\play\command" ""                                '"$1" -Djava.library.path="$INSTDIR" -jar "$INSTDIR\${FAT_NAME}" "%1"'

 
        ; .mpd elements
 
 
        ; .mpd elements