From d95129494ff81520181e04d02f6cfa3577baeb59 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Wed, 29 Aug 2018 11:10:20 +0100 Subject: docker: Use heredocs where possible This was suggested in a recent review [1]. Make it happen. [1] http://patchwork.ozlabs.org/patch/933979/#1941584 Signed-off-by: Stephen Finucane Suggested-by: Petr Vorel Reviewed-by: Petr Vorel --- tools/docker/entrypoint.sh | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/tools/docker/entrypoint.sh b/tools/docker/entrypoint.sh index afa8533..32f7132 100755 --- a/tools/docker/entrypoint.sh +++ b/tools/docker/entrypoint.sh @@ -57,21 +57,26 @@ reset_data() { # check if patchwork is mounted. Checking if we exist is a # very good start! if [ ! -f ~patchwork/patchwork/tools/docker/entrypoint.sh ]; then - echo "The patchwork directory doesn't seem to be mounted!" - echo "Are you using docker-compose?" - echo "If so, you may need to create an SELinux rule. Refer to the" - echo "development installation documentation for more information." - echo "If not, you need -v PATH_TO_PATCHWORK:/home/patchwork/patchwork" + cat << EOF +The patchwork directory doesn't seem to be mounted! + +Are you using docker-compose? If so, you may need to create an SELinux rule. +Refer to the development installation documentation for more information. +If not, you need -v PATH_TO_PATCHWORK:/home/patchwork/patchwork +EOF exit 1 fi # check if we need to rebuild because requirements changed for x in /tmp/requirements-*.txt; do if ! cmp $x ~/patchwork/$(basename $x); then - echo "A requirements file has changed." - echo "You may need to rebuild the patchwork image:" - echo " docker-compose build web" - echo "" + cat << EOF +A requirements file has changed. + +You may need to rebuild the patchwork image: + + docker-compose build web +EOF diff -u $x ~/patchwork/$(basename $x) fi done -- cgit v1.2.3