WIP

gsmolk · gsmolk · commit 30adbd549fcd · 2019-08-09T01:26:11.000+03:00
diff --git a/build/helpers/probackup_installer.cmd b/build/helpers/probackup_installer.cmd
@@ -10,20 +10,20 @@ 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%
 )
 
 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%
 )
 
 IF %PRODUCT_NAME% == "" (
 	ECHO Invalid PROBACKUP_EDITION: %PROBACKUP_EDITION%
 	GOTO :ERROR
 )
 
+SET PG_REG_KEY=SOFTWARE\Postgres Professional\%ARCH%\%PRODUCT_NAME%\%PG_MAJOR_VERSION%\Installations\postgresql-%PG_MAJOR_VERSION%
+
 
 rm -rf %BUILD_DIR%\pg_probackup\installer || GOTO :ERROR
 MKDIR %BUILD_DIR%\pg_probackup\installer

Original file line number	Diff line number	Diff line change
`@@ -10,20 +10,20 @@ SET PRODUCT_NAME=""`
`10`	`10`	`IF %PROBACKUP_EDITION% == vanilla (`
`11`	`11`	`SET PRODUCT_NAME=PostgreSQL`
`12`	`12`	`SET PG_DEF_BRANDING=PostgreSQL%PG_MAJOR_VERSION%`
`13`		`- SET PG_REG_KEY=SOFTWARE\Postgres Professional\%ARCH%\%PRODUCT_NAME%\%PG_MAJOR_VERSION%\Installations\postgresql-%PG_MAJOR_VERSION%`
`14`	`13`	`)`
`15`	`14`
`16`	`15`	`IF %PROBACKUP_EDITION% == std (`
`17`	`16`	`SET PRODUCT_NAME=PostgresPro`
`18`	`17`	`SET PG_DEF_BRANDING=PostgresPro%PG_MAJOR_VERSION%`
`19`		`- SET PG_REG_KEY=SOFTWARE\Postgres Professional\%ARCH%\%PRODUCT_NAME%\%PG_MAJOR_VERSION%\Installations\postgresql-%PG_MAJOR_VERSION%`
`20`	`18`	`)`
`21`	`19`
`22`	`20`	`IF %PRODUCT_NAME% == "" (`
`23`	`21`	`ECHO Invalid PROBACKUP_EDITION: %PROBACKUP_EDITION%`
`24`	`22`	`GOTO :ERROR`
`25`	`23`	`)`
`26`	`24`
	`25`	`+SET PG_REG_KEY=SOFTWARE\Postgres Professional\%ARCH%\%PRODUCT_NAME%\%PG_MAJOR_VERSION%\Installations\postgresql-%PG_MAJOR_VERSION%`
	`26`	`+`
`27`	`27`
`28`	`28`	`rm -rf %BUILD_DIR%\pg_probackup\installer \|\| GOTO :ERROR`
`29`	`29`	`MKDIR %BUILD_DIR%\pg_probackup\installer`