WIP

gsmolk · gsmolk · commit a98bbb7dbee5 · 2019-08-09T01:12:47.000+03:00
diff --git a/build/helpers/postgres.cmd b/build/helpers/postgres.cmd
@@ -29,7 +29,7 @@ IF NOT "%GIT_BRANCH%"=="" (
 rm -rf %BUILD_DIR%\postgresql || GOTO :ERROR
 MKDIR %BUILD_DIR%\postgresql || GOTO :ERROR
 MKDIR %BUILD_DIR%\postgresql\postgresql-%PGVER% || GOTO :ERROR
-git clone -b %GIT_BRANCH% %GIT_PATH% %BUILD_DIR%\postgresql\postgresql-%PGVER% || GOTO :ERROR
+git clone --depth=1 -b %GIT_BRANCH% %GIT_PATH% %BUILD_DIR%\postgresql\postgresql-%PGVER% || GOTO :ERROR
 CD /D %BUILD_DIR%\postgresql\*%PGVER%* || GOTO :ERROR
 
 GOTO :NOTAR
diff --git a/build/helpers/probackup.cmd b/build/helpers/probackup.cmd
@@ -2,14 +2,17 @@ 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 (
    SET PRODUCT_NAME=PostgreSQL
 )
-ELSE IF %PROBACKUP_EDITION% == std (
+
+IF %PROBACKUP_EDITION% == std (
   SET PRODUCT_NAME=PostgresPro
 )
-ELSE (
+
+IF %PRODUCT_NAME% == "" (
 	ECHO Invalid PROBACKUP_EDITION: %PROBACKUP_EDITION%
 	GOTO :ERROR
 )
diff --git a/build/helpers/probackup_installer.cmd b/build/helpers/probackup_installer.cmd
@@ -5,19 +5,21 @@ 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 PG_REG_KEY=SOFTWARE\Postgres Professional\%ARCH%\%PRODUCT_NAME%\%PG_MAJOR_VERSION%\Installations\postgresql-%PG_MAJOR_VERSION%
+SET PRODUCT_NAME=""
 
 IF %PROBACKUP_EDITION% == vanilla (
    SET PRODUCT_NAME=PostgreSQL
    SET PG_DEF_BRANDING=PostgreSQL%PG_MAJOR_VERSION%
    SET PG_REG_KEY=SOFTWARE\Postgres Professional\%ARCH%\%PRODUCT_NAME%\%PG_MAJOR_VERSION%\Installations\postgresql-%PG_MAJOR_VERSION%
 )
-ELSE IF %PROBACKUP_EDITION% == std (
+
+IF %PROBACKUP_EDITION% == std (
   SET PRODUCT_NAME=PostgresPro
   SET PG_DEF_BRANDING=PostgresPro%PG_MAJOR_VERSION%
   SET PG_REG_KEY=SOFTWARE\Postgres Professional\%ARCH%\%PRODUCT_NAME%\%PG_MAJOR_VERSION%\Installations\postgresql-%PG_MAJOR_VERSION%
 )
-ELSE (
+
+IF %PRODUCT_NAME% == "" (
 	ECHO Invalid PROBACKUP_EDITION: %PROBACKUP_EDITION%
 	GOTO :ERROR
 )

Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,17 @@ CALL %ROOT%\build\helpers\setvars.cmd`
`2`	`2`
`3`	`3`	`SET PROBACKUP_URL=https://github.com/postgrespro/pg_probackup/tarball/%PROBACKUP_VERSION%`
`4`	`4`	`SET BIN_DIR=%BUILD_DIR%\pg_probackup_%PG_MAJOR_VERSION%_%PROBACKUP_VERSION%_%ARCH%`
	`5`	`+SET PRODUCT_NAME=""`
`5`	`6`
`6`	`7`	`IF %PROBACKUP_EDITION% == vanilla (`
`7`	`8`	`SET PRODUCT_NAME=PostgreSQL`
`8`	`9`	`)`
`9`		`-ELSE IF %PROBACKUP_EDITION% == std (`
	`10`	`+`
	`11`	`+IF %PROBACKUP_EDITION% == std (`
`10`	`12`	`SET PRODUCT_NAME=PostgresPro`
`11`	`13`	`)`
`12`		`-ELSE (`
	`14`	`+`
	`15`	`+IF %PRODUCT_NAME% == "" (`
`13`	`16`	`ECHO Invalid PROBACKUP_EDITION: %PROBACKUP_EDITION%`
`14`	`17`	`GOTO :ERROR`
`15`	`18`	`)`