From 7b741a32cddb94442c7663f94c6c3b29e91e4158 Mon Sep 17 00:00:00 2001 From: Nicola Soranzo Date: Wed, 6 Jun 2018 18:26:58 +0100 Subject: [PATCH] Fix `GALAXY_RUN_ALL=1 ./run.sh --daemon` Broken in commit 0ea8107191ea1a3bc8b4b57623c981c06f38092e . Reported by @lparsons in https://github.com/galaxyproject/galaxy/pull/6262#issuecomment-395113621 --- run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run.sh b/run.sh index 0210375afac..62fc61c188e 100755 --- a/run.sh +++ b/run.sh @@ -59,12 +59,12 @@ find_server "${GALAXY_CONFIG_FILE:-none}" galaxy if [ "$run_server" = "python" -a -n "$GALAXY_RUN_ALL" ]; then servers=$(sed -n 's/^\[server:\(.*\)\]/\1/ p' "$GALAXY_CONFIG_FILE" | xargs echo) if [ -z "$stop_daemon_arg_set" -a -z "$daemon_or_restart_arg_set" ]; then - echo "ERROR: \$GALAXY_RUN_ALL cannot be used without the '--daemon', '--stop-daemon' or 'restart' arguments to run.sh" + echo "ERROR: \$GALAXY_RUN_ALL cannot be used without the '--daemon', '--stop-daemon', 'restart', 'start' or 'stop' arguments to run.sh" exit 1 fi for server in $servers; do echo "Executing: python $server_args --server-name=\"$server\" --pid-file=\"$server.pid\" --log-file=\"$server.log\"" - python $server_args --server-name="$server" --pid-file="$server.pid" --log-file="$server.log" + eval python $server_args --server-name="$server" --pid-file="$server.pid" --log-file="$server.log" if [ -n "$wait_arg_set" -a -n "$daemon_or_restart_arg_set" ]; then while true; do sleep 1