Skip to content

Commit ba4774e

Browse files
authored
[+] add VC++ 2015-2019 redistributable, fixes #73 (#76)
1 parent 9707125 commit ba4774e

3 files changed

Lines changed: 10 additions & 17 deletions

File tree

installer/patroni.iss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#define MyAppName "Patroni Environment Setup"
55
#define MyAppInstallDir "PES"
6-
#define MyAppVersion "v220726"
6+
#define MyAppVersion "v240516"
77
#define MyAppPublisher "CYBERTEC PostgreSQL International GmbH"
88
#define MyAppURL "https://www.cybertec-postgresql.com/"
99

make.bat

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
@ECHO off
22
SET MD=PES
3+
SET VCREDIST_REF=https://aka.ms/vs/17/release/vc_redist.x64.exe
34
SET ETCD_REF=https://github.com/etcd-io/etcd/releases/download/v3.5.13/etcd-v3.5.13-windows-amd64.zip
45
SET PATRONI_REF=https://github.com/zalando/patroni/archive/refs/tags/v3.3.0.zip
56
SET MICRO_REF=https://github.com/zyedidia/micro/releases/download/v2.0.13/micro-2.0.13-win64.zip
@@ -27,6 +28,10 @@ XCOPY doc %MD%\doc\ /E || EXIT /B
2728
@ECHO --- End bootstrapping ---
2829

2930

31+
@ECHO --- Download VCREDIST ---
32+
curl %VCREDIST_REF% --location --output %MD%\vc_redist.x64.exe || EXIT /B
33+
@ECHO --- VCREDIST downloaded ---
34+
3035
@ECHO --- Download ETCD ---
3136
curl %ETCD_REF% --location --output %TEMP%\etcd.zip || EXIT /B
3237
if exist %SEVENZIP% (
@@ -41,8 +46,6 @@ COPY src\etcd.yaml %MD%\etcd\ || EXIT /B
4146
DEL %TEMP%\etcd.zip || EXIT /B
4247
@ECHO --- ETCD downloaded ---
4348

44-
45-
4649
@ECHO --- Download PES GUI ---
4750
curl %PES_REF% --location --output %TEMP%\pes.zip || EXIT /B
4851
if exist %SEVENZIP% (
@@ -79,8 +82,6 @@ COPY src\vip.yaml %MD%\vip-manager\ || EXIT /B
7982
DEL %TEMP%\vip.zip || EXIT /B
8083
@ECHO --- VIP-MANAGER downloaded ---
8184

82-
83-
8485
@ECHO --- Download POSTGRESQL ---
8586
curl %PGSQL_REF% --location --output %TEMP%\pgsql.zip || EXIT /B
8687
if exist %SEVENZIP% (
@@ -94,8 +95,6 @@ RMDIR /Q /S "%MD%\pgsql\pgAdmin 4" "%MD%\pgsql\symbols" || EXIT /B
9495
DEL %TEMP%\pgsql.zip || EXIT /B
9596
@ECHO --- POSTGRESQL downloaded ---
9697

97-
98-
9998
@ECHO --- Download PATRONI ---
10099
curl %PATRONI_REF% --location --output %TEMP%\patroni.zip || EXIT /B
101100
if exist %SEVENZIP% (
@@ -110,24 +109,18 @@ COPY src\patroni.yaml %MD%\patroni\ || EXIT /B
110109
DEL %TEMP%\patroni.zip || EXIT /B
111110
@ECHO --- PATRONI downloaded ---
112111

113-
114-
115112
@ECHO --- Update Python and PIP installation ---
116113
CALL install-env.bat || EXIT /B
117114
MOVE python-install.exe %MD%\ || EXIT /B
118115
@ECHO --- Python and PIP installation updated ---
119116

120-
121-
122117
@ECHO --- Download PATRONI packages ---
123118
CD %MD%\patroni
124119
%PIP% download -r requirements.txt -d .patroni-packages
125120
%PIP% download psycopg2-binary -d .patroni-packages
126121
CD ..\..
127122
@ECHO --- PATRONI packages downloaded ---
128123

129-
130-
131124
@ECHO --- Download WINSW ---
132125
curl %WINSW_REF% --location --output %MD%\patroni\patroni_service.exe || EXIT /B
133126
COPY src\patroni_service.xml %MD%\patroni\ || EXIT /B
@@ -137,14 +130,10 @@ COPY %MD%\patroni\patroni_service.exe %MD%\vip-manager\vip_service.exe /B || EXI
137130
COPY src\vip_service.xml %MD%\vip-manager\ || EXIT /B
138131
@ECHO --- WINSW downloaded ---
139132

140-
141-
142133
@ECHO --- Creating windows installer ---
143134
CALL make-installer.bat || EXIT /B
144135
@ECHO --- Installer generated successfully ---
145136

146-
147-
148137
@ECHO --- Prepare archive ---
149138
if exist %SEVENZIP% (
150139
%SEVENZIP% a "%MD%.zip" -y "%MD%"

src/install.ps1

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
#Requires -Version 7.0
22
#Requires -RunAsAdministrator
33

4+
Write-Host "--- Installing VC++ 2015-2019 redistributable ---" -ForegroundColor blue
5+
Start-Process -FilePath .\vc_redist.x64.exe -ArgumentList "/install /quiet /norestart" -NoNewWindow -Wait
6+
Write-Host "--- VC++ 2015-2019 redistributable installed ---`n" -ForegroundColor green
7+
48
Write-Host "--- Installing Python runtime ---" -ForegroundColor blue
59
Start-Process -FilePath .\python-install.exe -ArgumentList "/quiet InstallAllUsers=1 PrependPath=1 Include_test=0 Include_launcher=0" -NoNewWindow -Wait
610

0 commit comments

Comments
 (0)