From 37a7899f6f72f8b2e77a790ef7ff1222f302ac58 Mon Sep 17 00:00:00 2001 From: Joel Bradshaw Date: Thu, 16 Dec 2021 08:48:34 +0000 Subject: [PATCH] Consistently quote $@, check for argument Also add $@ to a couple commands, and add a check for the argument to the CORS command since it's required --- bw-dev | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/bw-dev b/bw-dev index 0a06b5edb..97a38834b 100755 --- a/bw-dev +++ b/bw-dev @@ -131,7 +131,7 @@ case "$CMD" in makeitblack ;; populate_streams) - runweb python manage.py populate_streams $@ + runweb python manage.py populate_streams "$@" ;; populate_suggestions) runweb python manage.py populate_suggestions @@ -140,7 +140,7 @@ case "$CMD" in runweb python manage.py generateimages ;; generate_preview_images) - runweb python manage.py generate_preview_images $@ + runweb python manage.py generate_preview_images "$@" ;; copy_media_to_s3) awscommand "bookwyrm_media_volume:/images"\ @@ -155,11 +155,18 @@ case "$CMD" in --acl public-read" "$@" ;; set_cors_to_s3) + set +x + config_file=$1 + if [ -z "$config_file" ]; then + echo "This command requires a JSON file containing a CORS configuration as an argument" + exit 1 + fi + set -x awscommand "$(pwd):/bw"\ "s3api put-bucket-cors\ --bucket ${AWS_STORAGE_BUCKET_NAME}\ --endpoint-url ${AWS_S3_ENDPOINT_URL}\ - --cors-configuration file:///bw/$@" + --cors-configuration file:///bw/$config_file" "$@" ;; runweb) runweb "$@"