Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e22b1b1

Browse files
committed
Fixed bug for uninstall. Change license text for PgPro Standart version
1 parent 856497e commit e22b1b1

File tree

3 files changed

+24
-55
lines changed

3 files changed

+24
-55
lines changed

nsis/license_std_en.txt

+3-15
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,7 @@
1-
====================
2-
PostgreSQL License
3-
====================
4-
Portions Copyright � 1996-2018, The PostgreSQL Global Development Group
5-
6-
Portions Copyright � 1994, The Regents of the University of California
7-
8-
Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is hereby granted, provided that the above copyright notice and this paragraph and the following two paragraphs appear in all copies.
9-
10-
IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
11-
12-
THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
1+
Postgres Pro Standard License
2+
-------------------------------------------------------
133

14-
==========================
15-
Postgres Pro Std License
16-
==========================
4+
Postgres Pro Standard is distributed under the terms of PostgreSQL license with additions by Postgres Professional:
175

186
Portions Copyright � 2015-2018, Postgres Professional
197

nsis/license_std_ru.txt

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1+
�������� Postgres Pro Standard
2+
----------------------------------------------------------
3+
4+
Postgres Pro Standard ���������������� �� �������� PostgreSQL � ������������ Postgres Professional:
5+
16
Portions Copyright (c) 2015-2018, Postgres Professional
27
Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
38
Portions Copyright (c) 1994 Regents of the University of California
49

5-
��������������� ����� �� �������������, �����������, ��������� � ��������������� ������� ������������ ����������� � ��� ������������ ��� ����� ������������, ���������� ��, ������������ � ����������������� ����, ������������� � ��������������� �������� ��������� � ��� ���������� ������-���� ����������, ��� ������� ��� ��� ������ ����� ����� ������������� ������ ���� ��������� �� ��������� ������, ������� ����� � ������ ��������� ������. ������������� � ������ �����, ����������� � ������ ��������, ������������� � ������ �������� ������� ������������ ��������� ��������.
10+
��������������� ����� �� �������������, �����������, ��������� � ��������������� ������� ������������ ����������� � ��� ������������ ��� ����� ������������, ���������� ��, ������������ � ����������������� ����, ������������� � ��������������� �������� ��������� � ��� ���������� ������-���� ����������, ��� ������� ��� ��� ������ ����� ����� ������������� ������ ���� ��������� �� ��������� ������, ������� ����� � ������ ��������� ������. ������������� � ������ �����, ����������� � ������ ��������, ������������� � ������ �������� ������� ������������ ��������� ��������.
611

712
�������������� ����������� �� ����� ������� ��������������� �� ����� �����������, ������� ������ ������, ���������� ������ ��� ��������, ����������� ��� ��������� �������������� ������� ������������ ����������� ��� ��� ������������, ���� ���� �������������� ����������� ��� ������� � ����������� ����� �����������.
813

nsis/postgresql.nsi

+15-39
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,8 @@ Section $(componentClient) secClient
260260
;File /r ${PG_INS_SOURCE_DIR}\symbols\*.*
261261

262262
;File "License.txt"
263+
SetOutPath $INSTDIR
264+
;File /nonfatal "/oname=$INSTDIR\License.txt" ${myLicenseFile_ru}
263265
File ${myLicenseFile_ru}
264266
File ${myLicenseFile_en}
265267

@@ -277,10 +279,12 @@ Section $(componentClient) secClient
277279
Call writeUnistallReg
278280
Call createRunPsql
279281

280-
282+
;for all users
283+
SetShellVarContext all
281284
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
282285

283286
;Create shortcuts
287+
; create common shortcuts for client and server
284288
CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
285289
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
286290

@@ -369,8 +373,7 @@ Section $(componentServer) sec1
369373
;File /r ${PG_INS_SOURCE_DIR}\share\*.*
370374
;File /r ${PG_INS_SOURCE_DIR}\symbols\*.*
371375

372-
File "License.txt"
373-
File "3rd_party_licenses.txt"
376+
;File "License.txt"
374377

375378
FileOpen $LogFile $INSTDIR\install.log w ;Opens a Empty File an fills it
376379

@@ -473,32 +476,12 @@ Section $(componentServer) sec1
473476

474477
creatBatErr6:
475478
;for all users
476-
SetShellVarContext all
479+
SetShellVarContext all
477480
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
478481

479482
FileWrite $LogFile "Create shortcuts$\r$\n"
480483

481484
;Create shortcuts
482-
CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
483-
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
484-
/*
485-
${if} ${FileExists} "$INSTDIR\scripts\runpgsql.bat"
486-
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\SQL Shell (psql).lnk" "$INSTDIR\scripts\runpgsql.bat" "" "$INSTDIR\scripts\pg-psql.ico" "0" "" "" "PostgreSQL command line utility"
487-
${else}
488-
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\SQL Shell (psql).lnk" "$INSTDIR\bin\psql.exe" "-h localhost -U $UserName_text -d postgres -p $TextPort_text" "" "" "" "" "PostgreSQL command line utility"
489-
${endif}
490-
491-
; set font Lucida Console for shortcut psql
492-
493-
FileWrite $LogFile "set font Lucida Console for shortcut psql$\r$\n"
494-
ReadRegStr $0 HKCU "Console\SQL Shell (psql)" "FaceName"
495-
${if} $0 == ""
496-
WriteRegStr HKCU "Console\SQL Shell (psql)" "FaceName" "Consolas"
497-
WriteRegDWORD HKCU "Console\SQL Shell (psql)" "FontWeight" "400"
498-
WriteRegDWORD HKCU "Console\SQL Shell (psql)" "FontSize" "917504"
499-
WriteRegDWORD HKCU "Console\SQL Shell (psql)" "FontFamily" "54"
500-
${endif}
501-
*/
502485
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Reload Configuration.lnk" "$INSTDIR\scripts\reload.bat" "" "" "" "" "" "Reload PostgreSQL configuration"
503486
;run as administrator
504487
push "$SMPROGRAMS\$StartMenuFolder\Reload Configuration.lnk"
@@ -521,19 +504,6 @@ Section $(componentServer) sec1
521504
call ShellLinkSetRunAs
522505
pop $0
523506

524-
/*
525-
CreateDirectory "$SMPROGRAMS\$StartMenuFolder\Documentation"
526-
527-
!insertmacro CreateInternetShortcut \
528-
"$SMPROGRAMS\$StartMenuFolder\Documentation\${PRODUCT_NAME} documentation (EN)" \
529-
"$INSTDIR\doc\postgresql-en.chm" \
530-
"$INSTDIR\doc\pg-help.ico" "0"
531-
532-
!insertmacro CreateInternetShortcut \
533-
"$SMPROGRAMS\$StartMenuFolder\Documentation\${PRODUCT_NAME} documentation (RU)" \
534-
"$INSTDIR\doc\postgresql-ru.chm" \
535-
"$INSTDIR\doc\pg-help.ico" "0"
536-
*/
537507
!insertmacro MUI_STARTMENU_WRITE_END
538508
; Create data dir begin
539509
FileWrite $LogFile "Create data dir begin$\r$\n"
@@ -928,7 +898,11 @@ Section "Uninstall"
928898
${endif}
929899

930900
Delete "$INSTDIR\Uninstall.exe"
931-
Delete "$INSTDIR\license.txt"
901+
;Delete "$INSTDIR\license.txt"
902+
Delete "$INSTDIR\${myLicenseFile_ru}"
903+
Delete "$INSTDIR\${myLicenseFile_en}"
904+
905+
932906
Delete "$INSTDIR\3rd_party_licenses.txt"
933907
Delete "$INSTDIR\install.log"
934908

@@ -2293,4 +2267,6 @@ Function IsServerSection
22932267
push "0"
22942268
${endif}
22952269

2296-
FunctionEnd
2270+
FunctionEnd
2271+
2272+

0 commit comments

Comments
 (0)