Skip to content

Commit 404c93d

Browse files
committed
Return back simple pgpro_upgrade call
1 parent 55b3663 commit 404c93d

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

nsis/postgresql.nsi

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -510,18 +510,20 @@ Section $(PostgreSQLString) sec1
510510
; there exist data directory. We need to stop service,
511511
; run pgpro-upgrade script and
512512

513-
;DetailPrint "Performing catalog upgradeon $DATA_DIR"
514-
;nsExec::ExecToStack '"$INSTDIR/scripts/pgpro_upgrade" "$DATA_DIR"'
515-
;Pop $0
516-
;Pop $1 # printed text, up to ${NSIS_MAX_STRLEN}
517-
;DetailPrint "$1"
518-
StrCpy $1 $ServiceAccount_text
519-
StrCpy $2 ""
520-
StrCpy $3 '"$INSTDIR/scripts/pgpro_upgrade" "$DATA_DIR"'
521-
StrCpy $4 0
522-
System::Call 'RunAs::RunAsW(w r1, w r2, w r3, *w .r4) i .r0 ? u'
523-
pop $0
524-
DetailPrint "pgpro_upgrade over runas return $0"
513+
DetailPrint "Performing catalog upgradeon $DATA_DIR"
514+
nsExec::ExecToStack '"$INSTDIR/scripts/pgpro_upgrade" "$DATA_DIR"'
515+
Pop $0
516+
Pop $1 # printed text, up to ${NSIS_MAX_STRLEN}
517+
DetailPrint "$1"
518+
519+
; Don't work with empty password:
520+
; StrCpy $1 $ServiceAccount_text
521+
; StrCpy $2 ""
522+
; StrCpy $3 '"$INSTDIR/scripts/pgpro_upgrade" "$DATA_DIR"'
523+
; StrCpy $4 0
524+
; System::Call 'RunAs::RunAsW(w r1, w r2, w r3, *w .r4) i .r0 ? u'
525+
; pop $0
526+
; DetailPrint "pgpro_upgrade over runas return $0"
525527
${endif}
526528

527529
DetailPrint "Start server service..."

0 commit comments

Comments
 (0)