minor fixes

gsmolk · gsmolk · commit f155782a07c1 · 2019-08-09T01:58:54.000+03:00
diff --git a/Readme.md b/Readme.md
@@ -61,4 +61,4 @@ SET PG_MAJOR_VERSION=11
 SET PG_PATCH_VERSION=4
 SET PROBACKUP_EDITION=std
 SET GIT_PATH=https://git.postgrespro.ru/pgpro-dev/postgrespro.git
-SET GIT_BRANCH=PGPRO11_4_1
+SET GIT_BRANCH=PGPRO11_4_1
diff --git a/build/helpers/probackup.cmd b/build/helpers/probackup.cmd
@@ -1,7 +1,6 @@
 CALL %ROOT%\build\helpers\setvars.cmd
 
 SET PROBACKUP_URL=https://github.com/postgrespro/pg_probackup/tarball/%PROBACKUP_VERSION%
-SET BIN_DIR=%BUILD_DIR%\pg_probackup_%PG_MAJOR_VERSION%_%PROBACKUP_VERSION%_%ARCH%
 SET PRODUCT_NAME=""
 
 IF %PROBACKUP_EDITION% == vanilla (
@@ -17,6 +16,8 @@ IF %PRODUCT_NAME% == "" (
 	GOTO :ERROR
 )
 
+SET BIN_DIR=%BUILD_DIR%\pg_probackup_%PROBACKUP_EDITION%_%PG_MAJOR_VERSION%_%PROBACKUP_VERSION%_%ARCH%
+
 echo Download sources ...
 
 rm -rf %BUILD_DIR%\pg_probackup || GOTO :ERROR
diff --git a/build/helpers/probackup_installer.cmd b/build/helpers/probackup_installer.cmd
@@ -3,7 +3,6 @@ CALL %ROOT%\build\helpers\setvars.cmd
 echo.
 echo Building PG_PROBACKUP Installer...
 
-SET BIN_DIR=%BUILD_DIR%\pg_probackup_%PG_MAJOR_VERSION%_%PROBACKUP_VERSION%_%ARCH%
 SET WIXDIR=C:\Program Files (x86)\WiX Toolset v3.11\bin
 SET PRODUCT_NAME=""
 
@@ -23,7 +22,7 @@ IF %PRODUCT_NAME% == "" (
 )
 
 SET PG_REG_KEY=SOFTWARE\Postgres Professional\%ARCH%\%PRODUCT_NAME%\%PG_MAJOR_VERSION%\Installations\postgresql-%PG_MAJOR_VERSION%
-
+SET BIN_DIR=%BUILD_DIR%\pg_probackup_%PROBACKUP_EDITION%_%PG_MAJOR_VERSION%_%PROBACKUP_VERSION%_%ARCH%
 
 rm -rf %BUILD_DIR%\pg_probackup\installer || GOTO :ERROR
 MKDIR %BUILD_DIR%\pg_probackup\installer
