Commit a5ccf61b authored by Pascal Déchamboux's avatar Pascal Déchamboux
Browse files

Optimize correction

parent 0bde69b8
Loading
Loading
Loading
Loading
+13 −4
Original line number Diff line number Diff line
@@ -813,27 +813,36 @@ stages:
    sfound=$(cf services | sed -e 1,3d | cut -d " " -f 1 | sed -ne "${tobesearched}")
    if [[ -z "${sfound}" ]]; then
      is_cups "${fvalues[1]}" "${fvalues[2]}"
      argfile=$(mktemp)
      if [[ "$res_is_cups" = "CUPS" ]]; then
        argfile=$(mktemp)
        log_info "Create command: cf cups \"${fvalues[0]}\" \"-p ${argfile}\""
        cf cups "${fvalues[0]}" "-p ${argfile}" >/dev/null
        rm -f "${argfile}"
      else
        if [[ -z "${fvalues[3]}" ]]; then
          if [[ -z "${fvalues[4]}" ]]; then
            log_info "Create command: cf create-service \"${fvalues[1]}\" \"${fvalues[2]}\" \"${fvalues[0]}\" -w"
            cf create-service "${fvalues[1]}" "${fvalues[2]}" "${fvalues[0]}" -w >/dev/null
          else
            argfile=$(mktemp)
            echo "${fvalues[4]}" >"${argfile}"
            cf create-service "${fvalues[1]}" "${fvalues[2]}" "${fvalues[0]}" "-c ${argfile}" -w >/dev/null
            log_info "Create command: cf create-service \"${fvalues[1]}\" \"${fvalues[2]}\" \"${fvalues[0]}\" -c \"${argfile}\" -w"
            cf create-service "${fvalues[1]}" "${fvalues[2]}" "${fvalues[0]}" -c "${argfile}" -w >/dev/null
            rm -f "${argfile}"
          fi
        else
          if [[ -z "${fvalues[4]}" ]]; then
            log_info "Create command: cf create-service \"${fvalues[1]}\" \"${fvalues[2]}\" \"${fvalues[0]}\" \"-b ${fvalues[3]}\" -w"
            cf create-service "${fvalues[1]}" "${fvalues[2]}" "${fvalues[0]}" "-b ${fvalues[3]}" -w >/dev/null
          else
            argfile=$(mktemp)
            echo "${fvalues[4]}" >"${argfile}"
            cf create-service "${fvalues[1]}" "${fvalues[2]}" "${fvalues[0]}" "-b ${fvalues[3]}" "-c ${argfile}" -w >/dev/null
            log_info "Create command: cf create-service \"${fvalues[1]}\" \"${fvalues[2]}\" \"${fvalues[0]}\" \"-b ${fvalues[3]}\" -c \"${argfile}\" -w"
            cf create-service "${fvalues[1]}" "${fvalues[2]}" "${fvalues[0]}" "-b ${fvalues[3]}" -c "${argfile}" -w >/dev/null
            rm -f "${argfile}"
          fi
        fi
      fi
      rm -f "${argfile}"
      log_info "... created"
    else
      log_warn "... service instance \"${fvalues[0]}\" already exist - skipped"