From 2df31d1a0e322437a3cea82c7ffdb1e718ebaf0f Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Sat, 28 Oct 2023 20:12:33 +0300
Subject: [PATCH] chore(ci): fix scripts (#14061)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**Description**
<!--
Please include a summary of the change and which issue is fixed. Please
also include relevant motivation and context. List any dependencies that
are required for this change.
-->
⚒️ Fixes  # <!--(issue)-->

**⚙️ Type of change**

- [ ] ⚙️ Feature/App addition
- [ ] 🪛 Bugfix
- [ ] ⚠️ Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] 🔃 Refactor of current code

**🧪 How Has This Been Tested?**
<!--
Please describe the tests that you ran to verify your changes. Provide
instructions so we can reproduce. Please also list any relevant details
for your test configuration
-->

**📃 Notes:**
<!-- Please enter any other relevant information here -->

**✔️ Checklist:**

- [ ] ⚖️ My code follows the style guidelines of this project
- [ ] 👀 I have performed a self-review of my own code
- [ ] #️⃣ I have commented my code, particularly in hard-to-understand
areas
- [ ] 📄 I have made corresponding changes to the documentation
- [ ] ⚠️ My changes generate no new warnings
- [ ] 🧪 I have added tests to this description that prove my fix is
effective or that my feature works
- [ ] ⬆️ I increased versions for any altered app according to semantic
versioning

**➕ App addition**

If this PR is an app addition please make sure you have done the
following.

- [ ] 🪞 I have opened a PR on
[truecharts/containers](https://github.com/truecharts/containers) adding
the container to TrueCharts mirror repo.
- [ ] 🖼️ I have added an icon in the Chart's root directory called
`icon.png`

---

_Please don't blindly check all the boxes. Read them and only check
those that apply.
Those checkboxes are there for the reviewer to see what is this all
about and
the status of this PR with a quick glance._
---
 .github/scripts/build-catalog.sh                 | 3 ++-
 charts/incubator/kubernetes-reflector/Chart.yaml | 3 +--
 charts/stable/odoo/Chart.yaml                    | 3 +--
 tools/build-release.sh                           | 3 ++-
 tools/gen-cat.sh                                 | 3 ++-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/scripts/build-catalog.sh b/.github/scripts/build-catalog.sh
index 040d859d07e..85ec3c3f57f 100755
--- a/.github/scripts/build-catalog.sh
+++ b/.github/scripts/build-catalog.sh
@@ -74,7 +74,8 @@ patch_apps() {
     cat ${target}/Chart.yaml | grep "icon" >> catalog/${train}/${chartname}/item.yaml
     sed -i "s|^icon:|icon_url:|g" catalog/${train}/${chartname}/item.yaml
     echo "categories:" >> catalog/${train}/${chartname}/item.yaml
-    cat ${target}/Chart.yaml | yq '.annotations."truecharts.org/category"' -r >> catalog/${train}/${chartname}/item.yaml
+    category=$(cat ${target}/Chart.yaml | yq '.annotations."truecharts.org/category"' -r)
+    echo "- $category" >> catalog/${train}/${chartname}/item.yaml
 
     # Generate screenshots
     screenshots=""
diff --git a/charts/incubator/kubernetes-reflector/Chart.yaml b/charts/incubator/kubernetes-reflector/Chart.yaml
index 9dc0bdbf28e..efccc256892 100644
--- a/charts/incubator/kubernetes-reflector/Chart.yaml
+++ b/charts/incubator/kubernetes-reflector/Chart.yaml
@@ -26,7 +26,6 @@ sources:
 type: application
 version: 0.1.-2
 annotations:
-  truecharts.org/catagories: |
-    - operators
+  truecharts.org/category: operators
   truecharts.org/SCALE-support: "true"
   truecharts.org/grade: U
diff --git a/charts/stable/odoo/Chart.yaml b/charts/stable/odoo/Chart.yaml
index 0d7339bdc46..0a2b7fb480c 100644
--- a/charts/stable/odoo/Chart.yaml
+++ b/charts/stable/odoo/Chart.yaml
@@ -28,6 +28,5 @@ sources:
 type: application
 version: 14.0.6
 annotations:
-  truecharts.org/catagories: |
-    - productivity
+  truecharts.org/category: productivity
   truecharts.org/SCALE-support: "true"
diff --git a/tools/build-release.sh b/tools/build-release.sh
index 8ee950fbf60..3e347b9d680 100755
--- a/tools/build-release.sh
+++ b/tools/build-release.sh
@@ -236,7 +236,8 @@ patch_apps() {
     cat ${target}/Chart.yaml | grep "icon" >> catalog/${train}/${chartname}/item.yaml
     sed -i "s|^icon:|icon_url:|g" catalog/${train}/${chartname}/item.yaml
     echo "categories:" >> catalog/${train}/${chartname}/item.yaml
-    cat ${target}/Chart.yaml | yq '.annotations."truecharts.org/category"' -r >> catalog/${train}/${chartname}/item.yaml
+    category=$(cat ${target}/Chart.yaml | yq '.annotations."truecharts.org/category"' -r)
+    echo "- $category" >> catalog/${train}/${chartname}/item.yaml
     # Generate SCALE App description file
     cat ${target}/Chart.yaml | yq .description -r >> ${target}/app-readme.md
     echo "" >> ${target}/app-readme.md
diff --git a/tools/gen-cat.sh b/tools/gen-cat.sh
index 7fea480aff0..e5e38f05274 100755
--- a/tools/gen-cat.sh
+++ b/tools/gen-cat.sh
@@ -232,7 +232,8 @@ patch_apps() {
     cat ${target}/Chart.yaml | grep "icon" >> catalog/${train}/${chartname}/item.yaml
     sed -i "s|^icon:|icon_url:|g" catalog/${train}/${chartname}/item.yaml
     echo "categories:" >> catalog/${train}/${chartname}/item.yaml
-    # cat ${target}/Chart.yaml | yq '.annotations."truecharts.org/category"' -r >> catalog/${train}/${chartname}/item.yaml
+    # category=$(cat ${target}/Chart.yaml | yq '.annotations."truecharts.org/category"' -r)
+    # echo "- $category" >> catalog/${train}/${chartname}/item.yaml
     # Generate SCALE App description file
     # cat ${target}/Chart.yaml | yq .description -r >> ${target}/app-readme.md
     echo "" >> ${target}/app-readme.md