From 40733516f1e961ea5768d7fae1be4a029fda6764 Mon Sep 17 00:00:00 2001 From: JT Archie Date: Thu, 24 Jan 2019 11:06:43 -0700 Subject: [PATCH] use metadata as YAML, rather than a greppable value [#163398392] --- tasks/stage-product/task.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tasks/stage-product/task.sh b/tasks/stage-product/task.sh index 971d4f699..1ff6fd7c7 100755 --- a/tasks/stage-product/task.sh +++ b/tasks/stage-product/task.sh @@ -37,8 +37,10 @@ STAGED=$(om-linux \ FILE_PATH=`find ./pivnet-product -name *.pivotal | sort | head -1` unzip $FILE_PATH metadata/* -PRODUCT_NAME="$(cat metadata/*.yml | grep '^name' | cut -d' ' -f 2)" -desired_version="$(cat metadata/*.yml | grep '^product_version' | cut -d' ' -f 2)" +metadata_json=$(ruby -ryaml -rjson -e 'puts YAML.load_file(Dir["metadata/*.yml"].first).to_json') + +PRODUCT_NAME="$(echo "$metadata_json" | jq -r .name)" +desired_version="$(echo "$metadata_json" | jq -r .product_version)" # Figure out which products are unstaged. UNSTAGED_ALL=$(jq -n --argjson available "$AVAILABLE" --argjson staged "$STAGED" \