Avoid cmd.exe sub-shell restrictions

dmpgpro · dmpgpro · commit 7583083cef62 · 2016-09-22T17:17:52.000+03:00
diff --git a/build/helpers/postgres_nsis_installer.cmd b/build/helpers/postgres_nsis_installer.cmd
@@ -12,6 +12,11 @@ SET PRODUCT_PUBLISHER="Postgres Professional Russia"
 SET COMPANY_NAME=PostgresPro
 SET PRODUCT_WEB_SITE="http://postgrespro.ru"
 
+IF "%PRODUCT_NAME%" == "" SET PRODUCT_NAME=PostgresPro
+
+SET PRODUCT_DIR_REGKEY=SOFTWARE\%COMPANY_NAME%\%ARCH%\%PRODUCT_NAME%\%PG_MAJOR_VERSION%
+SET OLD_PRODUCT_DIR_REGKEY=SOFTWARE\%COMPANY_NAME%\%ARCH%\%PG_MAJOR_VERSION%
+
 IF %ONE_C% == YES (
   SET PRODUCT_NAME=PostgresPro 1C
   SET PG_DEF_SERVICEID="postgrespro-1C-${PRODUCT_VERSION}"
@@ -21,18 +26,12 @@ IF %ONE_C% == YES (
   SET PRODUCT_DIR_REGKEY="Software\Postgres Professional\${PRODUCT_NAME}\${PRODUCT_VERSION}"
   SET PRODUCT_VERSION="%PG_MAJOR_VERSION%"
 ) ELSE (
-  IF "%PRODUCT_NAME%" == "" SET PRODUCT_NAME=PostgresPro
   SET PG_DEF_SERVICEID="postgresql-%ARCH%-%PG_MAJOR_VERSION%"
   SET PG_INS_SUFFIX="%ARCH%bit_Setup.exe"
-
-  SET PRODUCT_DIR_REGKEY="SOFTWARE\%COMPANY_NAME%\%ARCH%\%PRODUCT_NAME%\%PG_MAJOR_VERSION%"
   SET PG_REG_KEY="%PRODUCT_DIR_REGKEY%\Installations\postgresql-%PG_MAJOR_VERSION%"
   SET PG_REG_SERVICE_KEY="%PRODUCT_DIR_REGKEY%\Services\postgresql-%PG_MAJOR_VERSION%"
-
-  SET OLD_PRODUCT_DIR_REGKEY="SOFTWARE\%COMPANY_NAME%\%ARCH%\%PG_MAJOR_VERSION%"
   SET PG_OLD_REG_KEY="%OLD_PRODUCT_DIR_REGKEY%\Installations\postgresql-%PG_MAJOR_VERSION%"
   SET PG_OLD_REG_SERVICE_KEY="%OLD_PRODUCT_DIR_REGKEY%\Services\postgresql-%PG_MAJOR_VERSION%"
-
   SET PRODUCT_VERSION="%PG_MAJOR_VERSION% (%ARCH%)"
 )
 
@@ -51,8 +50,8 @@ REM PostgreSQL Section
 >>%NSIS_RES_DIR%\postgres.def.nsh ECHO !define PRODUCT_VERSION %PRODUCT_VERSION%
 >>%NSIS_RES_DIR%\postgres.def.nsh ECHO !define PRODUCT_PUBLISHER %PRODUCT_PUBLISHER%
 >>%NSIS_RES_DIR%\postgres.def.nsh ECHO !define PRODUCT_WEB_SITE %PRODUCT_WEB_SITE%
->>%NSIS_RES_DIR%\postgres.def.nsh ECHO !define PRODUCT_DIR_REGKEY %PRODUCT_DIR_REGKEY%
->>%NSIS_RES_DIR%\postgres.def.nsh ECHO !define OLD_PRODUCT_DIR_REGKEY %OLD_PRODUCT_DIR_REGKEY%
+>>%NSIS_RES_DIR%\postgres.def.nsh ECHO !define PRODUCT_DIR_REGKEY "%PRODUCT_DIR_REGKEY%"
+>>%NSIS_RES_DIR%\postgres.def.nsh ECHO !define OLD_PRODUCT_DIR_REGKEY "%OLD_PRODUCT_DIR_REGKEY%"
 >>%NSIS_RES_DIR%\postgres.def.nsh ECHO !define PG_REG_KEY %PG_REG_KEY%
 >>%NSIS_RES_DIR%\postgres.def.nsh ECHO !define PG_REG_SERVICE_KEY %PG_REG_SERVICE_KEY%
 >>%NSIS_RES_DIR%\postgres.def.nsh ECHO !define PG_OLD_REG_KEY %PG_OLD_REG_KEY%
