Skip to content

Commit 2211e7e

Browse files
committed
Run shellcheck
1 parent a51f3c4 commit 2211e7e

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

crates/ct_worker/scripts/create-log.sh

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ while true; do
1616
if [ "${LOCATION}" ]; then
1717
L=", LOCATION=${LOCATION}"
1818
fi
19-
read -p "Do you want to proceed with ENV=${ENV}, LOG_NAME=${LOG_NAME}${L}, CLOUDFLARE_ACCOUNT_ID=${CLOUDFLARE_ACCOUNT_ID}? (y/N) " yn
19+
read -rp "Do you want to proceed with ENV=${ENV}, LOG_NAME=${LOG_NAME}${L}, CLOUDFLARE_ACCOUNT_ID=${CLOUDFLARE_ACCOUNT_ID}? (y/N) " yn
2020
case $yn in
2121
[yY] ) echo "Proceeding..."; break;;
2222
[nN] ) echo "Exiting..."; exit;;
@@ -36,39 +36,39 @@ npx wrangler \
3636
-e="${ENV}" \
3737
-c "${WRANGLER_CONF}" \
3838
r2 bucket create \
39-
static-ct-public-${LOG_NAME} \
39+
"static-ct-public-${LOG_NAME}" \
4040
--update-config \
41-
--binding public_${LOG_NAME} "${location[@]}"
41+
--binding "public_${LOG_NAME}" "${location[@]}"
4242

4343
# Create KV namespace if it does not already exist
4444
npx wrangler \
4545
-e="${ENV}" \
4646
-c "${WRANGLER_CONF}" \
4747
kv namespace create \
48-
static-ct-cache-${LOG_NAME} \
48+
"static-ct-cache-${LOG_NAME}" \
4949
--update-config \
50-
--binding cache_${LOG_NAME}
50+
--binding "cache_${LOG_NAME}"
5151

5252
# Create witness and log signing keys if they do not already exist
53-
if npx wrangler -e=${ENV} -c "${WRANGLER_CONF}" secret list | grep -q WITNESS_KEY_${LOG_NAME}; then
53+
if npx wrangler -e="${ENV}" -c "${WRANGLER_CONF}" secret list | grep -q "WITNESS_KEY_${LOG_NAME}"; then
5454
echo "WITNESS_KEY_${LOG_NAME} already exists"
5555
else
5656
openssl genpkey -algorithm ed25519 |
57-
npx wrangler -c "${WRANGLER_CONF}" -e=${ENV} secret put WITNESS_KEY_${LOG_NAME}
57+
npx wrangler -e="${ENV}" -c "${WRANGLER_CONF}" secret put "WITNESS_KEY_${LOG_NAME}"
5858
fi
59-
if npx wrangler -e=${ENV} -c "${WRANGLER_CONF}" secret list | grep -q SIGNING_KEY_${LOG_NAME}; then
59+
if npx wrangler -e="${ENV}" -c "${WRANGLER_CONF}" secret list | grep -q "SIGNING_KEY_${LOG_NAME}"; then
6060
echo "SIGNING_KEY_${LOG_NAME} already exists"
6161
else
6262
openssl genpkey -algorithm EC -pkeyopt ec_paramgen_curve:P-256 |
63-
npx wrangler -e=${ENV} -c "${WRANGLER_CONF}" secret put SIGNING_KEY_${LOG_NAME}
63+
npx wrangler -e="${ENV}" -c "${WRANGLER_CONF}" secret put "SIGNING_KEY_${LOG_NAME}"
6464
fi
6565

6666
echo "DONE"
6767
echo "NOTE: If you intend to run wrangler dev with this log, you must add the appropriate signing keys to .dev.vars"
6868
echo "~~~~~~"
69-
echo "echo -n \"SIGNING_KEY_${LOG_NAME}=\\\\\"\" >> .dev.vars"
70-
echo "openssl genpkey -algorithm EC -pkeyopt ec_paramgen_curve:P-256 | sed 's/$/\\\\\\\\\\\\\\\\n/g' | tr -d \\\\n >> .dev.vars"
71-
echo "echo '\"' >> .dev.vars"
72-
echo "echo -n \"WITNESS_KEY_${LOG_NAME}=\\\\\"\" >> .dev.vars"
73-
echo "openssl genpkey -algorithm ed25519 | sed 's/$/\\\\\\\\\\\\\\\\n/g' | tr -d \\\\n >> .dev.vars"
74-
echo "echo '\"' >> .dev.vars"
69+
printf 'echo -n "SIGNING_KEY_%s=\\"" >> .dev.vars\n' "${LOG_NAME}"
70+
printf 'openssl genpkey -algorithm EC -pkeyopt ec_paramgen_curve:P-256 | sed '\''s/$/\\\\n/g'\'' | tr -d '\''\\n'\'' >> .dev.vars\n'
71+
printf 'echo \\" >> .dev.vars\n'
72+
printf 'echo -n "WITNESS_KEY_%s=\\"" >> .dev.vars\n' "${LOG_NAME}"
73+
printf 'openssl genpkey -algorithm ed25519 | sed '\''s/$/\\\\n/g'\'' | tr -d '\''\\n'\'' >> .dev.vars\n'
74+
printf 'echo \\" >> .dev.vars\n'

crates/ct_worker/scripts/create-root-kv.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ cd "$(dirname "$0")/.." || exit # this script assumes it's runnnig inside the ct
55

66
# Helper script to create resources for a log shard.
77

8-
if [ -z $ENV ] || [ -z $CLOUDFLARE_ACCOUNT_ID ]; then
9-
echo "ENV, LOG_NAME, LOCATION, and CLOUDFLARE_ACCOUNT_ID must all be set"
8+
if [ -z "${ENV}" ] || [ -z "${CLOUDFLARE_ACCOUNT_ID}" ]; then
9+
echo "ENV and CLOUDFLARE_ACCOUNT_ID must all be set"
1010
exit 1
1111
fi
1212

1313
WRANGLER_CONF=${WRANGLER_CONF:-wrangler.jsonc}
1414

1515
while true; do
16-
read -p "Do you want to proceed with ENV=${ENV}, CLOUDFLARE_ACCOUNT_ID=${CLOUDFLARE_ACCOUNT_ID}? (y/N) " yn
16+
read -rp "Do you want to proceed with ENV=${ENV}, CLOUDFLARE_ACCOUNT_ID=${CLOUDFLARE_ACCOUNT_ID}? (y/N) " yn
1717
case $yn in
1818
[yY] ) echo "Proceeding..."; break;;
1919
[nN] ) echo "Exiting..."; exit;;

0 commit comments

Comments
 (0)