From 09b4b0348f50e0e7f7b2af59b49371c1b3075852 Mon Sep 17 00:00:00 2001 From: Sergey Pashinin Date: Fri, 15 May 2020 04:04:14 +0300 Subject: [PATCH] Fix SC2002 and SC2086 --- deploy/vault_cli.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/deploy/vault_cli.sh b/deploy/vault_cli.sh index 5fb44ad5..3ab3b2c4 100644 --- a/deploy/vault_cli.sh +++ b/deploy/vault_cli.sh @@ -45,15 +45,15 @@ vault_cli_deploy() { # JSON does not allow multiline strings. # So replacing new-lines with "\n" here - _ckey=$(cat "$2" | sed -z 's/\n/\\n/g') - _ccert=$(cat "$3" | sed -z 's/\n/\\n/g') - _cca=$(cat "$4" | sed -z 's/\n/\\n/g') - _cfullchain=$(cat "$5" | sed -z 's/\n/\\n/g') + _ckey=$(sed -z 's/\n/\\n/g' < "$2") + _ccert=$(sed -z 's/\n/\\n/g' < "$3") + _cca=$(sed -z 's/\n/\\n/g' < "$4") + _cfullchain=$(sed -z 's/\n/\\n/g' < "$5") URL="$VAULT_ADDR/v1/$VAULT_PREFIX/$_cdomain" if [ -n "$FABIO" ]; then - curl --silent -H "X-Vault-Token: $VAULT_TOKEN" --request POST --data "{\"cert\": \"$_cfullchain\", \"key\": \"$_ckey\"}" $URL || return 1 + curl --silent -H "X-Vault-Token: $VAULT_TOKEN" --request POST --data "{\"cert\": \"$_cfullchain\", \"key\": \"$_ckey\"}" "$URL" || return 1 else curl --silent -H "X-Vault-Token: $VAULT_TOKEN" --request POST --data "{\"value\": \"$_ccert\"}" "$URL/cert.pem" || return 1 curl --silent -H "X-Vault-Token: $VAULT_TOKEN" --request POST --data "{\"value\": \"$_ckey\"}" "$URL/cert.key" || return 1