Skip to content

Commit

Permalink
Update CHANGELOG.md for version 1.8.1 and improve Grunt installation …
Browse files Browse the repository at this point in the history
…checks (#51)
  • Loading branch information
dermatz authored Oct 21, 2024
1 parent e667b8d commit fbe7a60
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ All notable changes to this project will be documented in this file.

---

## UNRELEASED 1.9.0
## UNRELEASED 1.8.1

- added documentation for color assignments in `CONTRIBUTING.md` to standardize the use of color variables in bash scripts
- added detailed color definitions and a usage example in the new "Color Assignments" section
- added Github Action to check if Pull Request contains `CHANGELOG.md` updates
- added Discord invite link to `README.md` and `CONTRIBUTING.md`
- changed `MIT-LICENSES.md` to `LICENSE` and set this tool under GNU GENERAL PUBLIC LICENSE 3.0
- fixed issue to check and install grunt correctly if it is missing [https://github.com/dermatz/ddev-woodoo-buildtools-magento/issues/50]

---

Expand Down
12 changes: 8 additions & 4 deletions commands/web/woodoo_components/build
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,18 @@ function buildMagentoDefault() {
fi

# check if grunt exist
if ! command -v grunt &>/dev/null; then
if "${DDEV_COMPOSER_ROOT}/node_modules/.bin/grunt" --version &>/dev/null; then
echo -e "${txtcyn}${ICON_SUCCESS} Grunt is installed${txtrst}"
else
echo -e "\n\n${txtcyn}${ICON_ERROR} Install missing Grunt${txtrst}\n\n"
npm install grunt # install grunt locally in ddev container for the project

npm install grunt
sudo npm install grunt -g
if ! command -v grunt &>/dev/null; then
sudo npm install grunt -g
fi

if ! command -v grunt &>/dev/null; then
echo -e "${txtred}${ICON_ERROR} Could not install grunt. Please check your installation.${txtrst}"
echo -e "${txtred}${ICON_ERROR} Could not install grunt global. Please install grunt manually ${txtcyn}sudo npm install grunt -g ${txtrst}."
else
echo -e "${txtcyn}${ICON_SUCCESS} Grunt installed successfully.${txtrst}"
fi
Expand Down

0 comments on commit fbe7a60

Please sign in to comment.