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

Correct bash scripting pb #3

parent d404a106

templates/gitlab-ci-cf.yml

+4 −4
Original line number Diff line number Diff line
@@ -778,7 +778,7 @@ stages: 
   	  fi

    else

      if [[ "${field_value}" == "\""* ]]; then

        desc_field=$(expr substr ${field_value} 2 $(( ${#field_value} - 2 )))

        desc_field=${field_value:1:$(( ${#field_value} - 2 ))}

      else

        desc_field=${field_value}

      fi
@@ -816,9 +816,9 @@ stages: 
    smsg="Create service instance ${COLOR_YELLOW}${service_desc}${COLOR_NONE}: "

    for fi in "${!fields[@]}"

    do

      get_desc_field "${service_desc}" "${fields[$fi]}" "${mandatory[$fi]}"

      fvalues[$fi]=$(echo "${desc_field}" | tr -d '\r' | envsubst)

      log_info "--- ${fields[$fi]}: ${COLOR_YELLOW}${fvalues[$fi]}${COLOR_NONE}"

      get_desc_field "${service_desc}" "${fields[fi]}" "${mandatory[fi]}"

      fvalues[fi]=$(echo "${desc_field}" | tr -d '\r' | envsubst)

      log_info "--- ${fields[fi]}: ${COLOR_YELLOW}${fvalues[fi]}${COLOR_NONE}"

    done

    log_info "${smsg}service definition OK - proceed"

    tobesearched="/^${fvalues[0]}\$/p"