From 16ed5d5e795e1222e9ade5efe77c104f938f4485 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Fri, 3 Aug 2018 00:14:45 +0000 Subject: [PATCH] env-wal-e: Fix shellcheck warnings. In puppet/zulip/files/postgresql/env-wal-e line 6: export AWS_ACCESS_KEY_ID=$(crudini --get "$ZULIP_SECRETS_CONF" secrets s3_backups_key) ^-- SC2155: Declare and assign separately to avoid masking return values. In puppet/zulip/files/postgresql/env-wal-e line 7: export AWS_SECRET_ACCESS_KEY=$(crudini --get "$ZULIP_SECRETS_CONF" secrets s3_backups_secret_key) ^-- SC2155: Declare and assign separately to avoid masking return values. In puppet/zulip/files/postgresql/env-wal-e line 9: if [ $? -ne 0 ]; then ^-- SC2181: Check exit code directly with e.g. 'if mycmd;', not indirectly with $?. Signed-off-by: Anders Kaseorg --- puppet/zulip/files/postgresql/env-wal-e | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/puppet/zulip/files/postgresql/env-wal-e b/puppet/zulip/files/postgresql/env-wal-e index d061ee04bc..c836409ed7 100755 --- a/puppet/zulip/files/postgresql/env-wal-e +++ b/puppet/zulip/files/postgresql/env-wal-e @@ -3,10 +3,11 @@ if [ -z "$ZULIP_SECRETS_CONF" ]; then ZULIP_SECRETS_CONF=/etc/zulip/zulip-secrets.conf fi -export AWS_ACCESS_KEY_ID=$(crudini --get "$ZULIP_SECRETS_CONF" secrets s3_backups_key) -export AWS_SECRET_ACCESS_KEY=$(crudini --get "$ZULIP_SECRETS_CONF" secrets s3_backups_secret_key) -s3_backups_bucket=$(crudini --get "$ZULIP_SECRETS_CONF" secrets s3_backups_bucket 2>&1) -if [ $? -ne 0 ]; then +AWS_ACCESS_KEY_ID=$(crudini --get "$ZULIP_SECRETS_CONF" secrets s3_backups_key) +export AWS_ACCESS_KEY_ID +AWS_SECRET_ACCESS_KEY=$(crudini --get "$ZULIP_SECRETS_CONF" secrets s3_backups_secret_key) +export AWS_SECRET_ACCESS_KEY +if ! s3_backups_bucket=$(crudini --get "$ZULIP_SECRETS_CONF" secrets s3_backups_bucket 2>&1); then echo "Could not determine which s3 bucket to use:" "$s3_backups_bucket" exit 1 fi