Skip to content

Commit 119b725

Browse files
committed
use relative paths to node bin scripts, removing npx
1 parent 3ebbfb1 commit 119b725

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

Makefile

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ endif
2121
BINDATA := modules/{options,public,templates}/bindata.go
2222
GOFILES := $(shell find . -name "*.go" -type f ! -path "./vendor/*" ! -path "*/bindata.go")
2323
GOFMT ?= gofmt -s
24+
NODE_BIN := $(PWD)/node_modules/.bin
2425

2526
GOFLAGS := -i -v
2627
EXTRA_GOFLAGS ?=
@@ -367,22 +368,24 @@ release-compress:
367368

368369
.PHONY: js
369370
js:
370-
@hash npx > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
371-
echo "Please install npm version 5.2+"; \
371+
@if ([ ! -d "$(NODE_BIN)" ]); then \
372+
echo "node_modules directory is absent, please run 'npm install' first"; \
372373
exit 1; \
373374
fi;
374-
npx eslint public/js
375+
376+
$(NODE_BIN)/eslint public/js
375377

376378
.PHONY: css
377379
css:
378-
@hash npx > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
379-
echo "Please install npm version 5.2+"; \
380+
@if ([ ! -d "$(NODE_BIN)" ]); then \
381+
echo "node_modules directory is absent, please run 'npm install' first"; \
380382
exit 1; \
381383
fi;
382-
npx lesshint public/less/
383-
npx -p less lessc --clean-css="--s0 -b" public/less/index.less public/css/index.css
384-
$(foreach file, $(filter-out public/less/themes/_base.less, $(wildcard public/less/themes/*)),npx -p less lessc --clean-css="--s0 -b" public/less/themes/$(notdir $(file)) > public/css/theme-$(notdir $(call strip-suffix,$(file))).css;)
385-
npx postcss --use autoprefixer --no-map --replace public/css/*
384+
385+
$(NODE_BIN)/lesshint public/less/
386+
$(NODE_BIN)/lessc --clean-css="--s0 -b" public/less/index.less public/css/index.css
387+
$(foreach file, $(filter-out public/less/themes/_base.less, $(wildcard public/less/themes/*)),$(NODE_BIN)/lessc --clean-css="--s0 -b" public/less/themes/$(notdir $(file)) > public/css/theme-$(notdir $(call strip-suffix,$(file))).css;)
388+
$(NODE_BIN)/postcss --use autoprefixer --no-map --replace public/css/*
386389

387390
@diff=$$(git diff public/css/*); \
388391
if ([ ! -z "$CI" ] && [ -n "$$diff" ]); then \

0 commit comments

Comments
 (0)