diff --git a/recipes/discourse/crud.sh b/recipes/discourse/crud.sh index 9c241ac..0c0fb71 100755 --- a/recipes/discourse/crud.sh +++ b/recipes/discourse/crud.sh @@ -1,7 +1,7 @@ #!/bin/bash function check_service_running() { - lxc exec "$container" -- bash -c "docker ps --format '{{.Names}},{{.Ports}}' | grep $1 | grep $2" + lxc exec "$container" -- bash -c "docker ps --format '{{.Names}},{{.Ports}}' | grep $1 | grep -q $2" } function _read() { @@ -10,7 +10,6 @@ function _read() { check_container "$container" check_service_running "$longname" "$port" enable_trace - return 0 } function _create() { diff --git a/scripts/miaou b/scripts/miaou index 7351da9..53701f0 100755 --- a/scripts/miaou +++ b/scripts/miaou @@ -504,9 +504,7 @@ function build_services() { command="env MIAOU_BASEDIR=$MIAOU_BASEDIR MIAOU_CONFIGDIR=$MIAOU_CONFIGDIR $recipe --port $port --container $container --name $name --fqdn $fqdn --domain $domain --subdomain $subdomain" [[ "$data" != "null" ]] && command+=" --data \"$data\"" - # eval "$command -r" # USEFUL for debugging when read fails!!! - - if ! eval "$command -r" >/dev/null; then + if ! eval "$command -r"; then echoinfo "CREATE RECIPE" # echo "$command -c"