[vlc-devel] [PATCH] NSIS: Add ability to skip the other bitness uninstall

[Nick Briggs]

Being pedantic, and you may choose to ignore me, but...

> ---
> extras/package/win32/NSIS/vlc.win32.nsi.in | 22 ++++++++++++++++++++--
> 1 file changed, 20 insertions(+), 2 deletions(-)
> 
> diff --git a/extras/package/win32/NSIS/vlc.win32.nsi.in b/extras/package/win32/NSIS/vlc.win32.nsi.in
> index d1d446c18d..4b28d1aad3 100644
> --- a/extras/package/win32/NSIS/vlc.win32.nsi.in
> +++ b/extras/package/win32/NSIS/vlc.win32.nsi.in
> @@ -572,8 +572,23 @@ WinOk:
> 
>   ${If} $PreviousVersion != ""
>     ; Uninstall the other bitness bit version!
> -    MessageBox MB_OK|MB_ICONSTOP "An ${OTHER_BITNESS}bit version of VLC was detected, it must be uninstalled first!"
> -
> +    MessageBox MB_YESNOCANCEL|MB_ICONQUESTION \
> +    "An ${OTHER_BITNESS}bit version of VLC was detected, it should be uninstalled first! \

In English it's "A 32-bit" or "A 64-bit" not "An 32-bit..."

> +    Do you want to uninstall it?" \
> +    IDYES uninstall_other_bitness \
> +    IDCANCEL uninstall_other_bitness_canceld

Spelling: ..._cancelled (English) or ..._canceled (American)

> +
> +  ; If the lines below are reached, the user denied to uninstall the other bitness VLC, ask if she is shure

Spelling: sure; the wording here is awkward ("denied to uninstall"), perhaps "denied uninstallation of the other", but it's only a comment...

> +  MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION|MB_DEFBUTTON2 \
> +    "Keeping the other version of VLC and installing this one can lead to unexpected scenarios.$\n\

Perhaps "behaviour" (English) or "behavior" (American)... scenarios doesn't quite have the right sense here. 

> +    Note that you will not get different entries in the start menu or different desktop icons. \
> +    The Windows App list will only show one VLC and uninstalling both can be tricky." \
> +    IDOK no_uninstall_other_bitness
> +
> +uninstall_other_bitness_canceld:

See above

> +  Quit
> +
> +uninstall_other_bitness:
>     SetRegView ${OTHER_BITNESS}
>     ReadRegStr $R1 ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString"
>     ReadRegStr $R2 ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "InstallLocation"
> @@ -603,6 +618,9 @@ WinOk:
>     StrCpy $PreviousVersion ""
>   ${EndIf}
> 
> +no_uninstall_other_bitness:
> +  ; In this cases the user has chosen to intentionally install both 32 and 64 bit
> +
> 
>   ; See if previous version exists
>   Call ReadPreviousVersion
> -- 
> 2.14.3 (Apple Git-98)

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 5276 bytes
Desc: not available
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20180123/4bde0956/attachment.bin>