chore: Update Woodoo version to 1.6.5, fix issue with determining Hyv…

…a version

CHANGELOG.md

@@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file.
 ---
 
 ## Latest Release
+### 1.6.5
+-   fix an issue when reading `..theme/composer.json` to determine which Hyva version to use through composer.json
+-   add some GitHub Status-Badges to `README.md`
 
 ### 1.6.4
 -   updating wording - Thanks to @andreas-penner-basecom

README.md

@@ -1,9 +1,12 @@
-# [DDEV] Woodoo Frontend Buildtools for Magento & Hyvä
+# [DDEV] Woodoo Frontend Buildtools for Magento & Hyvä <img src="https://img.shields.io/github/v/release/dermatz/ddev-woodoo-buildtools-magento">
 
-[![tests](https://github.com/dermatz/ddev-woodoo-buildtools-magento/actions/workflows/tests.yml/badge.svg)](https://github.com/dermatz/ddev-woodoo-buildtools-magento/actions/workflows/tests.yml) <img src="https://img.shields.io/github/license/dermatz/ddev-woodoo-buildtools-magento" alt="License Badge (MIT-License)"> <img src="https://img.shields.io/github/last-commit/dermatz/ddev-woodoo-buildtools-magento" alt="Last commit date Badge">
+[![tests](https://github.com/dermatz/ddev-woodoo-buildtools-magento/actions/workflows/tests.yml/badge.svg)](https://github.com/dermatz/ddev-woodoo-buildtools-magento/actions/workflows/tests.yml) <img src="https://img.shields.io/librariesio/github/dermatz/ddev-woodoo-buildtools-magento" alt="Dependencies"> <img src="https://img.shields.io/github/last-commit/dermatz/ddev-woodoo-buildtools-magento" alt="Last commit date Badge"> <img src="https://img.shields.io/github/sponsors/dermatz" alt="Sponsors">
 
 ---
 
+https://img.shields.io/github/license/dermatz/ddev-woodoo-buildtools-magento
+
+
 This ddev add-on helps you to manage your theme build processes in Magento total easy. You can run a build command to build all your themes or a specific theme. Don't matter if the theme is a Magento Standard or Custom Theme, or maybe a Hyva theme. It automatically takes care which type of theme you use and will build it for you. If a dependency is missing, Woodoo will install it.
 
 _>> Build all your Magento themes at once, with Magic, build with Woodoo!_

commands/web/woodoo_components/build

@@ -74,7 +74,7 @@ function buildHyva() {
     HYVA_PATH=$1
     HYVA_NAME=$2
 
-    if [[ ! -f ${HYVA_PATH}composer.json ]]; then
+    if [[ ! -f "${DDEV_COMPOSER_ROOT}/${HYVA_PATH}/composer.json" ]]; then
         echo -e "${txtred}${ICON_ERROR} Could not find composer.json in Theme (${HYVA_PATH})"
         echo -e "${txtylw}${ICON_ARROW_RIGHT} Use composer.json from Magento-Root instead${txtrst}"
         cd "${DDEV_COMPOSER_ROOT}" || exit
@@ -84,6 +84,7 @@ function buildHyva() {
         # trunk-ignore(shellcheck/SC2046)
         # trunk-ignore(shellcheck/SC2005)
         # trunk-ignore(shellcheck/SC2312)
+        cd "${DDEV_COMPOSER_ROOT}/${HYVA_PATH}" || exit
         hyva_version=$(echo $(grep -oP '(?<="hyva-themes/magento2-default-theme": ").*' composer.json) | cut -d ' ' -f 1 | sed 's/"//g')
     fi
 

commands/web/woodoo_components/variables

@@ -1,6 +1,6 @@
 #!/bin/bash
 #ddev-generated - Do not modify this file; your modifications will be overwritten.
-WOODOO_VERSION="1.6.4"
+WOODOO_VERSION="1.6.5"
 LATEST_WOODOO_VERSION=$(curl -s https://api.github.com/repos/dermatz/ddev-woodoo-buildtools-magento/releases/latest | grep tag_name | cut -d '"' -f 4)
 
 PROJECT_CONFIG_FILE=".ddev/config-themes.yaml"