Commit d2b92392 authored by Damien Fouilleul's avatar Damien Fouilleul

NSIS: make sure 'Recommended' is the default option, and some misc cleanup

parent faa7c85c
...@@ -36,7 +36,6 @@ CRCCheck on ...@@ -36,7 +36,6 @@ CRCCheck on
InstType "Recommended" InstType "Recommended"
InstType "Minimum" InstType "Minimum"
InstType "Full" InstType "Full"
InstType "Recommended"
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; NSIS Modern User Interface configuration ; ; NSIS Modern User Interface configuration ;
...@@ -197,7 +196,7 @@ NoOwn: ...@@ -197,7 +196,7 @@ NoOwn:
FunctionEnd FunctionEnd
!macro RegisterExtensionSection EXT !macro RegisterExtensionSection EXT
Section /o ${EXT} Section ${EXT}
SectionIn 1 3 SectionIn 1 3
Push $R0 Push $R0
StrCpy $R0 ${EXT} StrCpy $R0 ${EXT}
...@@ -239,7 +238,6 @@ FunctionEnd ...@@ -239,7 +238,6 @@ FunctionEnd
;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;
!macro delprefs !macro delprefs
SectionIn 1 3
StrCpy $0 0 StrCpy $0 0
!define Index 'Line${__LINE__}' !define Index 'Line${__LINE__}'
"${Index}-Loop:" "${Index}-Loop:"
...@@ -480,7 +478,7 @@ Section /o "Mozilla plugin" SEC03 ...@@ -480,7 +478,7 @@ Section /o "Mozilla plugin" SEC03
SectionEnd SectionEnd
Section /o "ActiveX plugin" SEC04 Section "ActiveX plugin" SEC04
SectionIn 1 3 SectionIn 1 3
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
!insertmacro OpenUninstallLog !insertmacro OpenUninstallLog
...@@ -711,7 +709,6 @@ Section "Uninstall" SEC91 ...@@ -711,7 +709,6 @@ Section "Uninstall" SEC91
SectionEnd SectionEnd
Section /o "un.Delete preferences and cache" SEC92 Section /o "un.Delete preferences and cache" SEC92
SectionIn 1 3
!insertmacro delprefs !insertmacro delprefs
SectionEnd SectionEnd
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment