Make installer remember the install location from a previous installation.

diff --git a/src/version.h b/src/version.h
index 7097203..aa3d650 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -21,8 +21,8 @@
 
 #define VER_X264_MAJOR 2
 #define VER_X264_MINOR 0
-#define VER_X264_PATCH 1
-#define VER_X264_BUILD 146
+#define VER_X264_PATCH 2
+#define VER_X264_BUILD 147
 
 #define VER_X264_MINIMUM_REV 2146
 #define VER_X264_CURRENT_API 120

diff --git a/z_build.bat b/z_build.bat
index 63e65f9..76f2a2d 100644 (file)
--- a/z_build.bat
+++ b/z_build.bat
@@ -124,14 +124,16 @@ REM ///////////////////////////////////////////////////////////////////////////
 REM // Generate install script
 REM ///////////////////////////////////////////////////////////////////////////
 echo #Generated File - Do NOT modify! > "%NSI_FILE%"
-echo RequestExecutionLevel Admin >> "%NSI_FILE%"
-echo ShowInstDetails show >> "%NSI_FILE%"
-echo BrandingText `Created: %ISO_DATE%, %ISO_TIME% [Build #%BUILD_NO%]` >> "%NSI_FILE%"
 echo !define ZIP2EXE_NAME `Simple x264 Launcher (%ISO_DATE%)` >> "%NSI_FILE%"
 echo !define ZIP2EXE_OUTFILE `%OUT_FULL%` >> "%NSI_FILE%"
 echo !define ZIP2EXE_COMPRESSOR_LZMA >> "%NSI_FILE%"
 echo !define ZIP2EXE_INSTALLDIR `$PROGRAMFILES\MuldeR\Simple x264 Launcher v2` >> "%NSI_FILE%"
+echo !define ZIP2EXE_REGPATH `SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{986E454F-DACA-4326-A9C7-3E46C0BFFDCE}` >> "%NSI_FILE%"
 echo !define MUI_INSTFILESPAGE_COLORS "C5DEFB 000000" >> "%NSI_FILE%"
+echo RequestExecutionLevel Admin >> "%NSI_FILE%"
+echo ShowInstDetails show >> "%NSI_FILE%"
+echo BrandingText `Created: %ISO_DATE%, %ISO_TIME% [Build #%BUILD_NO%]` >> "%NSI_FILE%"
+echo InstallDirRegKey HKLM `${ZIP2EXE_REGPATH}` InstallLocation >> "%NSI_FILE%"
 echo !include `${NSISDIR}\Contrib\zip2exe\Base.nsh` >> "%NSI_FILE%"
 echo !include `${NSISDIR}\Contrib\zip2exe\Modern.nsh` >> "%NSI_FILE%"
 echo !include `%~dp0\etc\check_os.nsh` >> "%NSI_FILE%"
@@ -140,6 +142,7 @@ echo !include `%~dp0\etc\version.nsh` >> "%NSI_FILE%"
 echo !insertmacro X264_VERSIONINFO `%ISO_DATE%` `%ISO_TIME%` `%BUILD_NO%` >> "%NSI_FILE%"
 echo !insertmacro SECTION_BEGIN >> "%NSI_FILE%"
 echo File /r `%PACK_PATH%\*.*` >> "%NSI_FILE%"
+echo WriteRegStr HKLM `${ZIP2EXE_REGPATH}` InstallLocation `$INSTDIR` >> "%NSI_FILE%"
 echo !include `%~dp0\etc\shortcut.nsh` >> "%NSI_FILE%"
 echo !insertmacro SECTION_END >> "%NSI_FILE%"