Skip to content

Commit 7b3522e

Browse files
committed
Update CHANGELOG.md for version 1.8.1 and improve Grunt installation checks
1 parent e667b8d commit 7b3522e

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ All notable changes to this project will be documented in this file.
44

55
---
66

7-
## UNRELEASED 1.9.0
7+
## UNRELEASED 1.8.1
88

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

1516
---
1617

commands/web/woodoo_components/build

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,18 @@ function buildMagentoDefault() {
1515
fi
1616

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

21-
npm install grunt
22-
sudo npm install grunt -g
24+
if ! command -v grunt &>/dev/null; then
25+
sudo npm install grunt -g
26+
fi
2327

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

0 commit comments

Comments
 (0)