Make yq work again for version 4

onevcat · Mar 30, 2022 · 1caa5af · 1caa5af
1 parent 30052fa
commit 1caa5af
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.7.0
+2.7.4
diff --git a/Brewfile b/Brewfile
@@ -1,3 +1,3 @@
 brew "coreutils"
-brew "yq@3"
+brew "yq"
 brew "fswatch"
diff --git a/_scripts/sh/create_pages.sh b/_scripts/sh/create_pages.sh
@@ -25,8 +25,8 @@ _read_yaml() {
 
 read_categories() {
   local _yaml="$(_read_yaml "$1")"
-  local _categories="$(echo "$_yaml" | yq r - "categories.*")"
-  local _category="$(echo "$_yaml" | yq r - "category")"
+  local _categories="$(echo "$_yaml" | yq e ".categories | .." -)"
+  local _category="$(echo "$_yaml" | yq e ".category" -)"
 
   if [[ -n $_categories ]]; then
     echo "$_categories"
@@ -37,8 +37,8 @@ read_categories() {
 
 read_tags() {
   local _yaml="$(_read_yaml "$1")"
-  local _tags="$(echo "$_yaml" | yq r - "tags.*")"
-  local _tag="$(echo "$_yaml" | yq r - "tag")"
+  local _tags="$(echo "$_yaml" | yq e ".tags | .." -)"
+  local _tag="$(echo "$_yaml" | yq e ".tag" -)"
 
   if [[ -n $_tags ]]; then
     echo "$_tags"