Installer: Minor tweaks

This commit is contained in:
Birunthan Mohanathas 2013-10-19 12:26:33 +03:00
parent 5f274807c3
commit 3cf2c21c7b

View File

@ -669,15 +669,6 @@ SkipIniMove:
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
; Remove Rainmeter files mistakenly installed to root of Windows drive (old installer bug)
${GetRoot} "$WINDIR" $0
${If} ${FileExists} "$0\Rainmeter.exe"
${AndIfNot} ${FileExists} "$0\Plugins"
Delete "$0\Rainmeter.exe"
Delete "$0\Rainmeter.dll"
Delete "$0\SkinInstaller.exe"
${EndIf}
; Cleanup old stuff ; Cleanup old stuff
Delete "$INSTDIR\Rainmeter.chm" Delete "$INSTDIR\Rainmeter.chm"
Delete "$INSTDIR\Default.ini" Delete "$INSTDIR\Default.ini"
@ -706,12 +697,13 @@ SkipIniMove:
${EndIf} ${EndIf}
!ifdef INCLUDEFILES !ifdef INCLUDEFILES
File "..\..\Application\Rainmeter.exe.config"
${If} $instArc == "x86" ${If} $instArc == "x86"
!insertmacro InstallFiles "x32" !insertmacro InstallFiles "x32"
${Else} ${Else}
!insertmacro InstallFiles "x64" !insertmacro InstallFiles "x64"
${EndIf} ${EndIf}
File "..\..\Application\Rainmeter.exe.config"
RMDir /r "$INSTDIR\Languages" RMDir /r "$INSTDIR\Languages"
SetOutPath "$INSTDIR\Languages" SetOutPath "$INSTDIR\Languages"