Dev processes can be killed with ctrl-c (#56)

This commit is contained in:
Richard Silverton
2017-07-19 12:48:28 +01:00
committed by David Dias
parent cd7e5297fd
commit 4a83776fc5
2 changed files with 5 additions and 13 deletions

1
.gitignore vendored
View File

@@ -3,5 +3,4 @@ node_modules
public
static/js/*.js
static/css/*.css
dev.pid
auth.token

View File

@@ -5,7 +5,6 @@ IPFSGATEWAY="https://ipfs.io/ipfs/"
NPMBIN=./node_modules/.bin
NPM=npm
OUTPUTDIR=public
PIDFILE=dev.pid
ifeq ($(DEBUG), true)
PREPEND=
@@ -31,7 +30,6 @@ help:
@echo ' make css Compile the *.less to ./static/css '
@echo ' make minify Optimise all the things! '
@echo ' make dev Start a hot-reloding dev server on http://localhost:1313 '
@echo ' make dev-stop Stop the dev server '
@echo ' make deploy Add the website to your local IPFS node '
@echo ' make publish-to-domain Update $(DOMAIN) DNS record to the ipfs hash from the last deploy '
@echo ' make clean remove the generated files '
@@ -64,16 +62,11 @@ minify-img: install
$(PREPEND)find static/img -type d -exec $(NPMBIN)/imagemin {}/* --out-dir={} $(APPEND) \;
dev: install js css
$(PREPEND)[ ! -f $(PIDFILE) ] || rm $(PIDFILE) ; \
touch $(PIDFILE) ; \
($(NPMBIN)/watchify --noparse=jquery js/{index,implementations,bundles,media}.js -p [ factor-bundle -o static/js/index.js -o static/js/implementations.js -o static/js/bundles.js -o static/js/media.js ] -o static/js/common.js & echo $$! >> $(PIDFILE) ; \
$(NPMBIN)/nodemon --quiet --watch less --ext less --exec "make css" & echo $$! >> $(PIDFILE) ; \
hugo server & echo $$! >> $(PIDFILE))
dev-stop:
$(PREPEND)touch $(PIDFILE) ; \
[ -z "`(cat $(PIDFILE))`" ] || kill `(cat $(PIDFILE))` ; \
rm $(PIDFILE)
$(PREPEND) ( \
$(NPMBIN)/watchify --noparse=jquery js/{index,implementations,bundles,media}.js -p [ factor-bundle -o static/js/index.js -o static/js/implementations.js -o static/js/bundles.js -o static/js/media.js ] -o static/js/common.js \
$(NPMBIN)/nodemon --quiet --watch less --ext less --exec "make css" & \
hugo server -w \
)
deploy:
$(PREPEND)ipfs swarm peers >/dev/null || (echo "ipfs daemon must be online to publish" && exit 1)