From fd3be389b94a4054d42fd63c15ab320139ac94f1 Mon Sep 17 00:00:00 2001 From: Caitlin Campbell Date: Mon, 25 Nov 2019 13:33:35 +0100 Subject: Add cleaner python2/3 make serve command Stop the need to Ctrl-C twice in the event where you have both python versions on your system. --- Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b0ffe45..e7156fa 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,14 @@ +PYTHON3_AVAILABLE := $(shell python3 --version 2>&1) + site: ./makesite.py serve: site - cd _site && python -m SimpleHTTPServer 2> /dev/null || python3 -m http.server +ifeq ('$(PYTHON3_AVAILABLE)','') + cd _site && python -m SimpleHTTPServer +else + cd _site && python3 -m http.server +endif venv2: virtualenv ~/.venv/makesite -- cgit v1.2.3