Skip to content

Commit

Permalink
Fix issue with the windows install script. (fixes #704)
Browse files Browse the repository at this point in the history
Whereas the trying to install in "Program Files" the warning is shown even if the install dir is empty or none-existent.
  • Loading branch information
zaygraveyard committed Nov 22, 2017
1 parent d8cd53c commit 7f0098e
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions assets-windows/installer.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ VIAddVersionKey /LANG=0 "ProductName" "Koala"
VIAddVersionKey /LANG=0 "Comments" "A cool tool for web developers"
VIAddVersionKey /LANG=0 "CompanyName" "koala-app.com"
VIAddVersionKey /LANG=0 "FileDescription" "Koala installer"
VIAddVersionKey /LANG=0 "FileVersion" "2017.11.19"
VIAddVersionKey /LANG=0 "FileVersion" "2017.11.22"
VIAddVersionKey /LANG=0 "ProductVersion" "2.3.0"
VIProductVersion 2.3.0.0
VIFileVersion 2017.11.19.0
VIFileVersion 2017.11.22.0

SetCompressor /SOLID /FINAL lzma

Expand Down Expand Up @@ -88,16 +88,12 @@ Function VerifyDir
Call isEmptyDir
Pop $0
${If} $0 == 0
# ${If} ${FileExists} "$INSTDIR\*"
# MessageBox MB_ICONEXCLAMATION|MB_YESNO \
# `"$INSTDIR" already exists, delete it's content and continue installing?` \
# /SD IDYES \
# IDYES yep
${AndIf} ${FileExists} "$INSTDIR\*"
MessageBox MB_ICONEXCLAMATION|MB_YESNO \
"The selected directory already exists and is not empty.$\n\
`"$INSTDIR" already exists and is not empty.$\n\
This installer will delete all files and folders in that directory before \
installing Koala!$\n\
Do you want to continue?" \
Do you want to continue?` \
/SD IDYES \
IDYES yep
Abort
Expand Down

0 comments on commit 7f0098e

Please sign in to comment.