From 5306f19d8759c93bf87e5fed3937765ecb091e83 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Fri, 16 Oct 2015 19:53:52 +0200 Subject: [PATCH] Some installer fixes. --- etc/setup/setup.nsi | 11 +++++++++-- src/version.h | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/etc/setup/setup.nsi b/etc/setup/setup.nsi index bbc9adb..3dbdd0c 100644 --- a/etc/setup/setup.nsi +++ b/etc/setup/setup.nsi @@ -500,10 +500,8 @@ Section "!Install Files" Abort "Could not delete old binary!" ${EndIf} - SetOutPath "$INSTDIR" File /a `/oname=$R0` `${X264_SOURCE_PATH}\x264_launcher.exe` - SetOutPath "$INSTDIR" File /a `${X264_SOURCE_PATH}\*.dll` File /a `${X264_SOURCE_PATH}\*.txt` File /a `${X264_SOURCE_PATH}\*.html` @@ -582,6 +580,7 @@ SectionEnd Section "-Finished" !insertmacro PrintProgress "$(MUI_TEXT_FINISH_TITLE)." + ${IfThen} ${UnattendedMode} ${|} SetAutoClose true ${|} SectionEnd @@ -734,3 +733,11 @@ Function ShowReadmeFunction !insertmacro DisableNextButton $R0 ${StdUtils.ExecShellAsUser} $R1 "$INSTDIR\README.html" "open" "" FunctionEnd + +Function .onInstSuccess + ${If} ${UnattendedMode} + !insertmacro GetExecutableName $R0 + ${StdUtils.ExecShellAsUser} $R1 "$INSTDIR" "explore" "" + ${StdUtils.ExecShellAsUser} $R1 "$INSTDIR\$R0" "open" "--first-run" + ${EndIf} +FunctionEnd diff --git a/src/version.h b/src/version.h index c49231f..15b19fe 100644 --- a/src/version.h +++ b/src/version.h @@ -26,7 +26,7 @@ #define VER_X264_MAJOR 2 #define VER_X264_MINOR 6 #define VER_X264_PATCH 0 -#define VER_X264_BUILD 971 +#define VER_X264_BUILD 972 #define VER_X264_PORTABLE_EDITION (0)