commit b5bcf02b236f218fb7afa270af34a0a98e2a27ce parent 9b1fe44e28b29b21d2a012a08b27e42a4ed5500d Author: Dominik Schmidt <doeme@bastli.ethz.ch> Date: Thu, 6 Sep 2018 15:13:05 +0200 Some more modifications Diffstat:
| M | daemon.sh | | | 2 | +- |
| M | pipeline.sh | | | 6 | ++++++ |
| M | pipeline/99_print | | | 2 | +- |
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/daemon.sh b/daemon.sh @@ -1,3 +1,3 @@ #!/bin/sh -exec ./amqp-consume --server=backdoor.bastli.ch:5672 "--username=${USERNAME}" "--password=${PASSWORD}" --vhost="/" -q print_queue ./pipeline.sh +exec ./amqp-consume --server=backdoor.bastli.ch:5672 --username="${RABBIT_USERNAME}" "--password=${RABBIT_PASSWORD}" --vhost="/" --queue="print_queue" ./start_pipeline.sh diff --git a/pipeline.sh b/pipeline.sh @@ -1,5 +1,11 @@ #!/bin/bash +if [[ "${#@}" -eq 0 ]] +then + echo "No commands specified" >&2 + exit +fi + if [[ ${#@} -eq 1 ]] then exec "$1" diff --git a/pipeline/99_print b/pipeline/99_print @@ -1,6 +1,6 @@ #!/bin/sh -if [[ -n "$PRINT_TO_STDOUT" ]] +if [ -n "$PRINT_TO_STDOUT" ] then exec cat else