Skip to content

Commit 81c2eb6

Browse files
authored
Merge pull request #9 from cybertec-postgresql/7zip
use 7zip for faster zipping if it is installed
2 parents 32d8a91 + 936ad90 commit 81c2eb6

File tree

1 file changed

+32
-6
lines changed

1 file changed

+32
-6
lines changed

make.bat

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ SET MICRO_REF=https://github.com/zyedidia/micro/releases/download/v2.0.6/micro-2
66
SET WINSW_REF=https://github.com/winsw/winsw/releases/download/v2.9.0/WinSW.NET461.exe
77
SET VIP_REF=https://github.com/cybertec-postgresql/vip-manager/releases/download/v1.0-beta/vip-manager.zip
88
SET PGSQL_REF=https://get.enterprisedb.com/postgresql/postgresql-12.4-1-windows-x64-binaries.zip
9+
SET SEVENZIP="C:\Program Files\7-Zip\7z.exe"
910

1011
@ECHO --- Start bootstrapping ---
1112

1213
RMDIR /Q /S %MD% patroni > nul 2>&1
1314
DEL %MD%.zip > nul 2>&1
15+
DEL Patroni-Env-Setup.exe > nul 2>&1
1416
MKDIR %MD%
1517
COPY src\*.bat %MD%\
1618
COPY src\*.ps1 %MD%\
@@ -22,32 +24,52 @@ MOVE python-install.exe %MD%\
2224

2325
@ECHO --- Download ETCD ---
2426
curl %ETCD_REF% --location --output %TEMP%\etcd.zip
25-
powershell -Command "Expand-Archive '%TEMP%\etcd.zip' '%CD%'"
27+
if exist %SEVENZIP% (
28+
%SEVENZIP% x "%TEMP%\etcd.zip" -y -mmt -o"%CD%"
29+
) else (
30+
powershell -Command "Expand-Archive '%TEMP%\etcd.zip' '%CD%'"
31+
)
2632
MOVE etcd-* %MD%\etcd
2733
@ECHO --- ETCD downloaded ---
2834

2935
@ECHO --- Download MICRO ---
3036
curl %MICRO_REF% --location --output %TEMP%\micro.zip
31-
powershell -Command "Expand-Archive '%TEMP%\micro.zip' '%CD%'"
37+
if exist %SEVENZIP% (
38+
%SEVENZIP% x "%TEMP%\micro.zip" -y -mmt -o"%CD%"
39+
) else (
40+
powershell -Command "Expand-Archive '%TEMP%\micro.zip' '%CD%'"
41+
)
3242
MOVE micro-* %MD%\micro
3343
@ECHO --- MICRO downloaded ---
3444

3545
@ECHO --- Download VIP-MANAGER ---
3646
curl %VIP_REF% --location --output %TEMP%\vip.zip
37-
powershell -Command "Expand-Archive '%TEMP%\vip.zip' '%CD%'"
47+
if exist %SEVENZIP% (
48+
%SEVENZIP% x "%TEMP%\vip.zip" -y -mmt -o"%CD%"
49+
) else (
50+
powershell -Command "Expand-Archive '%TEMP%\vip.zip' '%CD%'"
51+
)
3852
MOVE vip-manager* %MD%\vip-manager
3953
@ECHO --- VIP-MANAGER downloaded ---
4054

4155
@ECHO --- Download POSTGRESQL ---
4256
curl %PGSQL_REF% --location --output %TEMP%\pgsql.zip
43-
powershell -Command "Expand-Archive '%TEMP%\pgsql.zip' '%CD%'"
57+
if exist %SEVENZIP% (
58+
%SEVENZIP% x "%TEMP%\pgsql.zip" -y -mmt -o"%CD%"
59+
) else (
60+
powershell -Command "Expand-Archive '%TEMP%\pgsql.zip' '%CD%'"
61+
)
4462
MOVE pgsql* %MD%\pgsql
4563
RMDIR /Q /S "%MD%\pgsql\pgAdmin 4" "%MD%\pgsql\symbols"
4664
@ECHO --- POSTGRESQL downloaded ---
4765

4866
@ECHO --- Download PATRONI ---
4967
curl %PATRONI_REF% --location --output %TEMP%\patroni.zip
50-
powershell -Command "Expand-Archive '%TEMP%\patroni.zip' '%CD%'"
68+
if exist %SEVENZIP% (
69+
%SEVENZIP% x "%TEMP%\patroni.zip" -y -mmt -o"%CD%"
70+
) else (
71+
powershell -Command "Expand-Archive '%TEMP%\patroni.zip' '%CD%'"
72+
)
5173
MOVE patroni-* %MD%\patroni
5274
DEL %MD%\patroni\postgres?.yml
5375
COPY src\patroni.yml %MD%\patroni\
@@ -70,7 +92,11 @@ COPY src\vip_service.xml %MD%\vip-manager\
7092
@ECHO --- WINSW downloaded ---
7193

7294
@ECHO --- Prepare archive ---
73-
powershell -Command "Compress-Archive '%MD%' '%MD%.zip'"
95+
if exist %SEVENZIP% (
96+
%SEVENZIP% a "%MD%.zip" -y -mmt "%MD%"
97+
) else (
98+
powershell -Command "Compress-Archive '%MD%' '%MD%.zip'"
99+
)
74100
@ECHO --- Archive compressed ---
75101

76102
@ECHO --- Creating windows installer ---

0 commit comments

Comments
 (0)