diff options
| author | Elmar Ludwig <elmar.ludwig@uni-osnabrueck.de> | 2023-02-06 16:15:23 +0000 |
|---|---|---|
| committer | David Siegfried <david.siegfried@uni-vechta.de> | 2023-02-06 16:15:23 +0000 |
| commit | 5f5a44fd7ebf76a620378b93dff435c38d748c15 (patch) | |
| tree | 7504d04dd10a91ce1a7e8ae5ea694f3a806534ff | |
| parent | cff48047b00b890600356fad29064b6a28532c2b (diff) | |
replace use of "npm bin" with "npx", fixes #2122
Closes #2122
Merge request studip/studip!1376
| -rw-r--r-- | Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -1,6 +1,5 @@ CODECEPT = composer/bin/codecept CATALOGS = locale/en/LC_MESSAGES/studip.mo locale/en/LC_MESSAGES/js-resources.json -NPM_BIN = $(shell npm bin) RESOURCES = $(shell find resources -type f) PHP_SOURCES = $(shell find app config lib public templates -name '*.php' \( ! -path 'public/plugins_packages/*' -o -path 'public/plugins_packages/core/*' \)) @@ -79,17 +78,17 @@ test-unit: $(CODECEPT) catalogs: npm $(CATALOGS) optimize-icons: npm - find public/assets/images/icons -type f | xargs -P0 $(NPM_BIN)/svgo -q --config=config/svgo.config.js + find public/assets/images/icons -type f | xargs -P0 npx svgo -q --config=config/svgo.config.js # default rules for gettext handling js-%.pot: $(VUE_SOURCES) - $(NPM_BIN)/gettext-extract --attribute v-translate --output $@ $(VUE_SOURCES) + npx gettext-extract --attribute v-translate --output $@ $(VUE_SOURCES) js-%.po: js-%.pot msgmerge -qU -C $(dir $@)studip.po $@ $< js-%.json: js-%.po - $(NPM_BIN)/gettext-compile --output $@ $< + npx gettext-compile --output $@ $< sed -i~ 's/^{[^{]*//;s/}$$//' $@ %.pot: $(PHP_SOURCES) |