IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove the "launch now" option in the Windows installer, as UAC could cause it to run as an elevated user. Fixes #5628

Browse Source 
While we're passing, fix a couple of InnoSetup build warnings and remove some unnecessary code.
This commit is contained in:
Dave Page 2021-02-26 16:24:39 +00:00
parent e8114b5dc6
commit 544483ae1f
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Make.bat
View File

@ -324,11 +324,9 @@ REM Main build sequence Ends
CD "%WD%\pkg\win32" CD "%WD%\pkg\win32"
ECHO Processing installer configuration script... ECHO Processing installer configuration script...
CALL "%PGADMIN_PYTHON_DIR%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in" "-o" "%WD%\pkg\win32\installer.iss.in_stage1" "-s" MYAPP_NAME -r """%APP_NAME%""" CALL "%PGADMIN_PYTHON_DIR%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in" "-o" "%WD%\pkg\win32\installer.iss.in_stage1" "-s" MYAPP_FULLVERSION -r """%APP_VERSION%"""
CALL "%PGADMIN_PYTHON_DIR%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage1" "-o" "%WD%\pkg\win32\installer.iss.in_stage2" "-s" MYAPP_FULLVERSION -r """%APP_VERSION%""" CALL "%PGADMIN_PYTHON_DIR%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage1" "-o" "%WD%\pkg\win32\installer.iss.in_stage2" "-s" MYAPP_VERSION -r """v%APP_MAJOR%"""
CALL "%PGADMIN_PYTHON_DIR%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage2" "-o" "%WD%\pkg\win32\installer.iss.in_stage3" "-s" MYAPP_VERSION -r """v%APP_MAJOR%""" CALL "%PGADMIN_PYTHON_DIR%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage2" "-o" "%WD%\pkg\win32\installer.iss" "-s" MYAPP_VCDIST -r """%PGADMIN_VCREDIST_DIRNAME%\%VCREDIST_FILE%"""
CALL "%PGADMIN_PYTHON_DIR%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage3" "-o" "%WD%\pkg\win32\installer.iss.in_stage4" "-s" MYAPP_ARCHITECTURESMODE -r """x64"""
CALL "%PGADMIN_PYTHON_DIR%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage4" "-o" "%WD%\pkg\win32\installer.iss" "-s" MYAPP_VCDIST -r """%PGADMIN_VCREDIST_DIRNAME%\%VCREDIST_FILE%"""
ECHO Cleaning up... ECHO Cleaning up...
DEL /s "%WD%\pkg\win32\installer.iss.in_stage*" > nul DEL /s "%WD%\pkg\win32\installer.iss.in_stage*" > nul
@ -337,7 +335,7 @@ REM Main build sequence Ends
CALL "%PGADMIN_INNOTOOL_DIR%\ISCC.exe" /q "%WD%\pkg\win32\installer.iss" || EXIT /B 1 CALL "%PGADMIN_INNOTOOL_DIR%\ISCC.exe" /q "%WD%\pkg\win32\installer.iss" || EXIT /B 1
ECHO Renaming installer... ECHO Renaming installer...
MOVE "%WD%\pkg\win32\Output\Setup.exe" "%DISTROOT%\%INSTALLERNAME%" > nul || EXIT /B 1 MOVE "%WD%\pkg\win32\Output\pgadmin4-setup.exe" "%DISTROOT%\%INSTALLERNAME%" > nul || EXIT /B 1
ECHO Location - %DISTROOT%\%INSTALLERNAME% ECHO Location - %DISTROOT%\%INSTALLERNAME%
ECHO Installer generated successfully. ECHO Installer generated successfully.

1
docs/en_US/release_notes_5_1.rst
View File

@ -20,5 +20,6 @@ Bug fixes
| `Issue #4959 <https://redmine.postgresql.org/issues/4959>`_ - Fixed an issue where the properties tab for collection nodes is unresponsive after switching the tabs. | `Issue #4959 <https://redmine.postgresql.org/issues/4959>`_ - Fixed an issue where the properties tab for collection nodes is unresponsive after switching the tabs.
| `Issue #5073 <https://redmine.postgresql.org/issues/5073>`_ - Fixed an issue where the Save button is enabled for functions/procedures by default when open the properties dialog. | `Issue #5073 <https://redmine.postgresql.org/issues/5073>`_ - Fixed an issue where the Save button is enabled for functions/procedures by default when open the properties dialog.
| `Issue #5467 <https://redmine.postgresql.org/issues/5467>`_ - Allow underscores in the Windows installation path. | `Issue #5467 <https://redmine.postgresql.org/issues/5467>`_ - Allow underscores in the Windows installation path.
| `Issue #5628 <https://redmine.postgresql.org/issues/5628>`_ - Remove the "launch now" option in the Windows installer, as UAC could cause it to run as an elevated user.
| `Issue #6018 <https://redmine.postgresql.org/issues/6018>`_ - Fixed encoding issue when database encoding set to SQL_ASCII and name of the column is in ASCII character. | `Issue #6018 <https://redmine.postgresql.org/issues/6018>`_ - Fixed encoding issue when database encoding set to SQL_ASCII and name of the column is in ASCII character.
| `Issue #6159 <https://redmine.postgresql.org/issues/6159>`_ - Ensure that the user should be able to kill the session from Dashboard if the user has a 'pg_signal_backend' role. | `Issue #6159 <https://redmine.postgresql.org/issues/6159>`_ - Ensure that the user should be able to kill the session from Dashboard if the user has a 'pg_signal_backend' role.

9
pkg/win32/installer.iss.in
View File

@ -1,11 +1,11 @@
#define MyAppName MYAPP_NAME #define MyAppName "pgAdmin 4"
#define MyAppVersion MYAPP_VERSION #define MyAppVersion MYAPP_VERSION
#define MyAppPublisher "The pgAdmin Development Team" #define MyAppPublisher "The pgAdmin Development Team"
#define MyAppURL "www.pgadmin.org" #define MyAppURL "www.pgadmin.org"
#define MyAppExeName "pgAdmin4.exe" #define MyAppExeName "pgAdmin4.exe"
#define MyAppID "C14F64E7-DCB9-4DE1-8560-16F08FCFF64E" #define MyAppID "C14F64E7-DCB9-4DE1-8560-16F08FCFF64E"
#define MyAppFullVersion MYAPP_FULLVERSION #define MyAppFullVersion MYAPP_FULLVERSION
#define MyAppArchitecturesMode MYAPP_ARCHITECTURESMODE #define MyAppArchitecturesMode "x64"
#define MyAppVCDist MYAPP_VCDIST #define MyAppVCDist MYAPP_VCDIST
#define MyAppInvalidPath "Please provide a valid path." #define MyAppInvalidPath "Please provide a valid path."
#define MyAppErrorMsgIsWin32 "You already have a 32 bit installation of pgAdmin 4. Please uninstall this before installing the 64 bit version." #define MyAppErrorMsgIsWin32 "You already have a 32 bit installation of pgAdmin 4. Please uninstall this before installing the 64 bit version."
@ -19,12 +19,12 @@ AppPublisher={#MyAppPublisher}
AppPublisherURL={#MyAppURL} AppPublisherURL={#MyAppURL}
AppSupportURL={#MyAppURL} AppSupportURL={#MyAppURL}
AppUpdatesURL={#MyAppURL} AppUpdatesURL={#MyAppURL}
DefaultDirName={pf}\{#MyAppName}\{#MyAppVersion} DefaultDirName={commonpf}\{#MyAppName}\{#MyAppVersion}
DefaultGroupName={#MyAppName} DefaultGroupName={#MyAppName}
DisableWelcomePage=no DisableWelcomePage=no
DisableProgramGroupPage=auto DisableProgramGroupPage=auto
LicenseFile=Resources\license.rtf LicenseFile=Resources\license.rtf
OutputBaseFilename=setup OutputBaseFilename=pgadmin4-setup
SetupIconFile=Resources\pgAdmin4.ico SetupIconFile=Resources\pgAdmin4.ico
Compression=lzma Compression=lzma
SolidCompression=yes SolidCompression=yes
@ -55,7 +55,6 @@ Source: "..\..\win-build\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdi
[Run] [Run]
Filename: "{app}\installer\{#MyAppVCDist}"; StatusMsg: "VC runtime redistributable package"; Parameters: "/passive /verysilent /norestart"; Check: InstallVC; Filename: "{app}\installer\{#MyAppVCDist}"; StatusMsg: "VC runtime redistributable package"; Parameters: "/passive /verysilent /norestart"; Check: InstallVC;
Filename: "{app}\runtime\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: runascurrentuser nowait postinstall skipifsilent
[Registry] [Registry]
Root: HKLM; Subkey: "Software\{#MyAppName}\{#MyAppVersion}"; Flags: uninsdeletekeyifempty Root: HKLM; Subkey: "Software\{#MyAppName}\{#MyAppVersion}"; Flags: uninsdeletekeyifempty