Skip to content

Commit 7023d2b

Browse files
committed
fix(sztp): exports hides exit code 1
Signed-off-by: Boris Glimcher <Boris.Glimcher@emc.com>
1 parent 6b352aa commit 7023d2b

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

sztp/generate.sh

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,20 @@ done
1919

2020
# keys and sertificates
2121
names+=(SBI_PRI_KEY_B64 SBI_PUB_KEY_B64 SBI_EE_CERT_B64 CLIENT_CERT_TA_B64)
22-
export SBI_PRI_KEY_B64=$(openssl enc -base64 -A -in ./generated-server/private_key.der)
23-
export SBI_PUB_KEY_B64=$(openssl enc -base64 -A -in ./generated-server/public_key.der)
24-
export SBI_EE_CERT_B64=$(openssl enc -base64 -A -in ./generated-server/cert_chain.cms)
25-
export CLIENT_CERT_TA_B64=$(openssl enc -base64 -A -in ./generated-server/ta_cert_chain.cms)
22+
SBI_PRI_KEY_B64=$(openssl enc -base64 -A -in ./generated-server/private_key.der)
23+
SBI_PUB_KEY_B64=$(openssl enc -base64 -A -in ./generated-server/public_key.der)
24+
SBI_EE_CERT_B64=$(openssl enc -base64 -A -in ./generated-server/cert_chain.cms)
25+
CLIENT_CERT_TA_B64=$(openssl enc -base64 -A -in ./generated-server/ta_cert_chain.cms)
2626

2727
# ports and addresses
2828
names+=(SZTPD_INIT_ADDR SZTPD_INIT_PORT SZTPD_NBI_PORT SZTPD_SBI_PORT)
29-
export SZTPD_INIT_ADDR=$(awk '/SZTPD_INIT_ADDR:/{print $2}' ../docker-compose.yml)
30-
export SZTPD_INIT_PORT=$(awk '/SZTPD_INIT_PORT:/{print $2}' ../docker-compose.yml)
31-
export SZTPD_NBI_PORT=$(awk '/SZTPD_NBI_PORT:/{print $2}' ../docker-compose.yml)
32-
export SZTPD_SBI_PORT=$(awk '/SZTPD_SBI_PORT:/{print $2}' ../docker-compose.yml)
29+
SZTPD_INIT_ADDR=$(awk '/SZTPD_INIT_ADDR:/{print $2}' ../docker-compose.yml)
30+
SZTPD_INIT_PORT=$(awk '/SZTPD_INIT_PORT:/{print $2}' ../docker-compose.yml)
31+
SZTPD_NBI_PORT=$(awk '/SZTPD_NBI_PORT:/{print $2}' ../docker-compose.yml)
32+
SZTPD_SBI_PORT=$(awk '/SZTPD_SBI_PORT:/{print $2}' ../docker-compose.yml)
3333

3434
# generate template
35+
export "${names[@]}"
3536
envsubst "$(printf '${%s} ' ${names[@]})" < template.json > generated_config.json
3637

3738
# check what changed

0 commit comments

Comments
 (0)