diff --git a/appveyor.yml b/appveyor.yml index 9f937bc8a7..6e57db92bf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,6 +20,8 @@ before_deploy: - cp OpenRA.Game/OpenRA.ico . - appveyor DownloadFile "http://downloads.sourceforge.net/project/nsis/NSIS 2/2.46/nsis-2.46-setup.exe" -FileName nsissetup.exe - nsissetup /S /D=%NSIS_ROOT% + - appveyor DownloadFile "http://nsis.sourceforge.net/mediawiki/images/archive/1/18/20140806212030!NsProcess.zip" -FileName NsProcess.zip + - 7z e NsProcess.zip -o%NSIS_ROOT% - appveyor DownloadFile "https://raw.githubusercontent.com/wiki/OpenRA/OpenRA/Changelog.md" -FileName Changelog.md - '%NSIS_ROOT%\makensis /DSRCDIR="%APPVEYOR_BUILD_FOLDER%" /DDEPSDIR="%APPVEYOR_BUILD_FOLDER%\thirdparty\windows" /V3 packaging/windows/OpenRA.nsi' - appveyor PushArtifact packaging/windows/OpenRA.Setup.exe -FileName OpenRA-%APPVEYOR_REPO_TAG_NAME%.exe diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi index 9e1219484a..508aa2ed9e 100644 --- a/packaging/windows/OpenRA.nsi +++ b/packaging/windows/OpenRA.nsi @@ -229,17 +229,17 @@ FunctionEnd !insertmacro Clean "un." Section "Uninstall" - ${nsProcess::FindProcess} "OpenRa.Game.exe" $R0 + ${nsProcess::FindProcess} "OpenRA.Game.exe" $R0 IntCmp $R0 0 gameRunning - ${nsProcess::FindProcess} "OpenRa.exe" $R0 + ${nsProcess::FindProcess} "OpenRA.exe" $R0 IntCmp $R0 0 gameRunning - ${nsProcess::FindProcess} "OpenRa.Editor.exe" $R0 + ${nsProcess::FindProcess} "OpenRA.Editor.exe" $R0 IntCmp $R0 0 gameRunning ${nsProcess::Unload} Call un.Clean Goto end gameRunning: - MessageBox MB_OK|MB_ICONEXCLAMATION "OpenRa is running. Please close it first" /SD IDOK + MessageBox MB_OK|MB_ICONEXCLAMATION "OpenRA is running. Please close it first" /SD IDOK abort end: SectionEnd