Merge pull request carpentries/styles#446

[rnaseq-cwl-training.git] / Makefile

diff --git a/Makefile b/Makefile
index ecdb2309f2f70feaea593119fa1c3c300ec4f69c..5ae969f6ddb2ae93bc9415aceebbd94cb065fbd3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,18 +8,27 @@ JEKYLL_VERSION=3.8.5
 PARSER=bin/markdown_ast.rb
 DST=_site
 
-# Check Python 3 (https://stackoverflow.com/a/4933395)
-ifneq (, $(shell which python3))
-  PYTHON := python3
-else ifneq (, $(shell which python))
-  PYTHON_VERSION_FULL := $(wordlist 2,4,$(subst ., ,$(shell python --version 2>&1)))
-  PYTHON_VERSION_MAJOR := $(word 1,${PYTHON_VERSION_FULL})
-  ifneq (3, ${PYTHON_VERSION_MAJOR})
-    $(error "Your system does not appear to have Python 3 installed.")
+# Check Python 3 is installed and determine if it's called via python3 or python
+# (https://stackoverflow.com/a/4933395)
+PYTHON3_EXE := $(shell which python3 2>/dev/null)
+ifneq (, $(PYTHON3_EXE))
+  ifeq (,$(findstring Microsoft/WindowsApps/python3,$(subst \,/,$(PYTHON3_EXE))))
+    PYTHON := python3
+  endif
+endif
+
+ifeq (,$(PYTHON))
+  PYTHON_EXE := $(shell which python 2>/dev/null)
+  ifneq (, $(PYTHON_EXE))
+    PYTHON_VERSION_FULL := $(wordlist 2,4,$(subst ., ,$(shell python --version 2>&1)))
+    PYTHON_VERSION_MAJOR := $(word 1,${PYTHON_VERSION_FULL})
+    ifneq (3, ${PYTHON_VERSION_MAJOR})
+      $(error "Your system does not appear to have Python 3 installed.")
+    endif
+    PYTHON := python
+  else
+      $(error "Your system does not appear to have any Python installed.")
   endif
-  PYTHON := python
-else
-    $(error "Your system does not appear to have any Python installed.")
 endif
 
 
@@ -30,7 +39,7 @@ all : commands
 
 ## commands         : show all commands.
 commands :
-       @grep -h -E '^##' ${MAKEFILES} | sed -e 's/## //g'
+       @grep -h -E '^##' ${MAKEFILES} | sed -e "s/## //g"
 
 ## docker-serve     : use docker to build the site
 docker-serve :