From 19e4587288d0414e22d5b2f107e20cbce4f1e9a9 Mon Sep 17 00:00:00 2001
From: mcmartin <mcmartin@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Mon, 14 Feb 2011 08:00:27 +0000
Subject: [PATCH] Fix Win32 installer for UAC integration on Vista/7 and for
 the new download paths.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3557 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/ChangeLog                             | 2 ++
 sc2/build/win32_install/uqm-installer.nsi | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index abdaaedbf..fe6212444 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,6 @@
 Changes towards version 0.7:
+- Update download paths for the new SourceForge File Release system - Michael
+- Fix UAC issues with installer for cleaner Vista/Win7 installs - Michael
 - Fixed compilation with Netplay disabled (bug #1091), from Sze Howe Koh
 - Fixed ship picking order after a simultaneous destruction, e.g.
   Shofixti picks last after Glory device (bugs #1087, #1088) - Alex
diff --git a/sc2/build/win32_install/uqm-installer.nsi b/sc2/build/win32_install/uqm-installer.nsi
index 92cbbf192..2ea4dc291 100644
--- a/sc2/build/win32_install/uqm-installer.nsi
+++ b/sc2/build/win32_install/uqm-installer.nsi
@@ -26,6 +26,9 @@ Var UQMUSERDATA
 !define MUI_HEADERIMAGE_BITMAP "ultron.bmp"
 !define MUI_HEADERIMAGE_RIGHT
 
+; UAC support
+RequestExecutionLevel admin
+
 ; Welcome page
 !insertmacro MUI_PAGE_WELCOME
 ; License page
@@ -234,7 +237,7 @@ AttemptDownload:
   GetTempFileName $DOWNLOADTARGET
   Delete $DOWNLOADTARGET
   CreateDirectory $DOWNLOADTARGET
-  NSISdl::download "http://$2.dl.sourceforge.net/sourceforge/sc2/$1" "$DOWNLOADTARGET\$1"
+  NSISdl::download "http://$2.dl.sourceforge.net/sourceforge/sc2/UQM/0.6.0/$1" "$DOWNLOADTARGET\$1"
   Pop $2
   StrCmp $2 "success" DownloadSuccessful
   StrCmp $2 "cancel" DownloadCanceled