rafaelcaricio/moviewyrm
1
0
Fork 0
forked from mirrors/bookwyrm
Code Issues 4 Pull requests Projects Releases Wiki Activity

Consistently quote $@, check for argument

Browse source 
Also add $@ to a couple commands, and add a check for the argument to
the CORS command since it's required
This commit is contained in:
Joel Bradshaw 2021-12-16 08:48:34 +00:00 committed by Joel Bradshaw
parent 8eb340945b
commit 37a7899f6f
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
bw-dev
View file

@ -131,7 +131,7 @@ case "$CMD" in
makeitblack makeitblack
;; ;;
populate_streams) populate_streams)
runweb python manage.py populate_streams $@ runweb python manage.py populate_streams "$@"
;; ;;
populate_suggestions) populate_suggestions)
runweb python manage.py populate_suggestions runweb python manage.py populate_suggestions
@ -140,7 +140,7 @@ case "$CMD" in
runweb python manage.py generateimages runweb python manage.py generateimages
;; ;;
generate_preview_images) generate_preview_images)
runweb python manage.py generate_preview_images $@ runweb python manage.py generate_preview_images "$@"
;; ;;
copy_media_to_s3) copy_media_to_s3)
awscommand "bookwyrm_media_volume:/images"\ awscommand "bookwyrm_media_volume:/images"\
@ -155,11 +155,18 @@ case "$CMD" in
--acl public-read" "$@" --acl public-read" "$@"
;; ;;
set_cors_to_s3) 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"\ awscommand "$(pwd):/bw"\
"s3api put-bucket-cors\ "s3api put-bucket-cors\
--bucket ${AWS_STORAGE_BUCKET_NAME}\ --bucket ${AWS_STORAGE_BUCKET_NAME}\
--endpoint-url ${AWS_S3_ENDPOINT_URL}\ --endpoint-url ${AWS_S3_ENDPOINT_URL}\
--cors-configuration file:///bw/$@" --cors-configuration file:///bw/$config_file" "$@"
;; ;;
runweb) runweb)
runweb "$@" runweb "$@"