standalone windows installer: fix qgis demo data link

qgis · Jun 27, 2014 · 99d4472 · 99d4472
1 parent 8fdd08a
commit 99d4472
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/ms-windows/QGIS-Installer.nsi b/ms-windows/QGIS-Installer.nsi
@@ -58,8 +58,6 @@ Name "${DISPLAYED_NAME}"
 ;Name of the output file (installer executable)
 OutFile "${INSTALLER_NAME}"
 
-;Define installation folder
-InstallDir "$PROGRAMFILES\${QGIS_BASE}"
 
 ;Tell the installer to show Install and Uninstall details as default
 ShowInstDetails show
@@ -102,6 +100,10 @@ Function .onInit
 		${EndIf}
 	${EndIf}
 
+	${If} $INSTDIR == ""
+		StrCpy $INSTDIR "$PROGRAMFILES\${QGIS_BASE}"
+	${EndIf}
+
 	Var /GLOBAL ASK_FOR_PATH
 	StrCpy $ASK_FOR_PATH "YES"
 
@@ -464,7 +466,7 @@ Section /O "Alaska Data Set" SecAlaskaSDB
 	;Set the size (in KB) of the unpacked archive file
 	AddSize 33914
 
-	StrCpy $HTTP_PATH "http://download.osgeo.org/qgis/data"
+	StrCpy $HTTP_PATH "http://qgis.org/downloads/data"
 	StrCpy $ARCHIVE_NAME "qgis_sample_data.tar.gz"
 	StrCpy $EXTENDED_ARCHIVE_NAME "Alaska"
 	StrCpy $ORIGINAL_UNTAR_FOLDER "qgis_sample_data"