conda.mk: fix OS detection on Windows

Signed-off-by: umarcor <unai.martinezcorral@ehu.eus>

Author: umarcor

conda.mk

@@ -29,7 +29,7 @@ endif
 
 include $(MAKE_DIR)/os.mk
 
-ifeq ($(OS_TYPE),Windows)
+ifeq ($(DETECTED_OS),Windows)
 TOP_DIR    := $(subst /,\,$(TOP_DIR))
 OS_EXT     := exe
 PYTHON_BIN := python.exe
@@ -43,6 +43,9 @@ SHELL      := bash
 CONDA_ENV_NAME_LINE := $(shell grep "name:" $(ENVIRONMENT_FILE))
 CONDA_ACTIVATE = source $(CONDA_DIR)/bin/activate
 endif
+ifeq ($(DETECTED_OS),MSYS)
+OS_EXT     := exe
+endif
 
 ifeq (,$(REQUIREMENTS_FILE))
 $(error "Set REQUIREMENTS_FILE value before including 'conda.mk'.")
@@ -99,7 +102,7 @@ $(ENV_DIR): | $(DOWNLOADS_DIR)
 $(DOWNLOADS_DIR):
 	$(MKDIR) "$(DOWNLOADS_DIR)"
 
-ifeq ($(OS_TYPE),Windows)
+ifeq ($(DETECTED_OS),Windows)
 $(CONDA_INSTALLER_DOWNLOAD): | $(DOWNLOADS_DIR)
 	$(WGET) https://repo.anaconda.com/miniconda/$(CONDA_INSTALLER) -O $(CONDA_INSTALLER_DOWNLOAD) 2>&1
 else
@@ -112,19 +115,19 @@ $(CONDA_PKGS_DEP): $(CONDA_PYTHON)
 	$(MKDIR) "$(CONDA_PKGS_DIR)"
 	$(TOUCH) "$(CONDA_PKGS_DEP)"
 
-ifeq ($(OS_TYPE),Windows)
+ifeq ($(DETECTED_OS),Windows)
 $(CONDA_PYTHON): $(CONDA_INSTALLER_DOWNLOAD)
 	cmd.exe /c start "" /WAIT  $(CONDA_INSTALLER_DOWNLOAD) /InstallationType=JustMe /AddToPath=0 /RegisterPython=0 /NoRegistry=1 /NoScripts=1 /S /D=$(CONDA_DIR)
-	$(TOUCH) "$(CONDA_PYTHON)"
 else
 $(CONDA_PYTHON): $(CONDA_INSTALLER_DOWNLOAD)
 	chmod a+x $(CONDA_INSTALLER_DOWNLOAD)
 	$(CONDA_INSTALLER_DOWNLOAD) -p $(CONDA_DIR) -b -f
-	$(TOUCH) "$(CONDA_PYTHON)"
 endif
 
+$(TOUCH) "$(CONDA_PYTHON)"
+
 # FIXME: Why does this break on Windows?
-ifeq ($(OS_TYPE),Windows)
+ifeq ($(DETECTED_OS),Windows)
 CONDA_PYVENV := $(CONDA_PYTHON)
 else
 $(CONDA_PYVENV): $(CONDA_PYTHON) $(MAKE_DIR)/conda.mk
@@ -161,7 +164,7 @@ dist-clean::
 
 FILTER_TOP = sed -e's@$(TOP_DIR)/@$$TOP_DIR/@'
 env-info:
-	@echo "               Currently running on: '$(OS_TYPE) ($(CPU_TYPE))'"
+	@echo "               Currently running on: '$(DETECTED_OS) ($(CPU_TYPE))'"
 	@echo
 	@echo "         Conda environment is named: '$(CONDA_ENV_NAME)'"
 	@echo "   Conda Env Top level directory is: '$(TOP_DIR)'"