From 41e21a30b9f00bf4aaa97bcfa30206997cfd7969 Mon Sep 17 00:00:00 2001
From: marxzuckerburg <mz@marxzuckerburg.com>
Date: Mon, 5 Oct 2020 10:13:12 +0100
Subject: [PATCH] ??

---
 bin/comrad-app            | 14 ++++++--------
 script/install-windows.sh |  3 ++-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/bin/comrad-app b/bin/comrad-app
index a97792f..87178f0 100755
--- a/bin/comrad-app
+++ b/bin/comrad-app
@@ -17,24 +17,22 @@ esac
 realpath() {
     [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"
 }
-path_conda="`realpath ~/comrad/lib`"
+
+path_lib="`realpath ~/comrad/lib`"
 path_conda="`realpath ~/comrad/lib/miniconda3`"
 path_venv="`realpath ~/comrad/code/venv`"
 path_repo="`realpath ~/comrad/code`"
 
 source $path_conda/etc/profile.d/conda.sh
-export PATH="$path_conda/Library/bin:$path_conda/Scripts:$path_conda:$PATH"
+# export PATH="$path_conda/Library/bin:$path_conda/Scripts:$path_conda:$PATH"
 export PATH="$path_conda/bin:$PATH"
-export PATH="$path_lib/themis-master/build:/usr/local/bin:$PATH"
-
+# export PATH="$path_lib/themis-master/build:/usr/local/bin:$PATH"
 
-if [ "$machine" = "MinGw" ]
-then
-    cmd //c call "$path_conda/Scripts/activate"
-fi
 
 conda activate $path_venv
 
+
+
 # update?
 path_repo_git="$path_repo/.git"
 if [ -d "$path_repo_git" ]
diff --git a/script/install-windows.sh b/script/install-windows.sh
index fcdb95a..014392f 100644
--- a/script/install-windows.sh
+++ b/script/install-windows.sh
@@ -72,7 +72,7 @@ echo '
 #### 
 # Package manager setups
 # 
-pacman -S --needed curl wget unzip gcc make openssl-devel git libcrypt-devel python3 python3-pip mingw-w64-x86_64-python-pandas python-devel mingw-w64-x86_64-python3-numpy
+pacman -S --needed curl wget unzip gcc make openssl-devel git libcrypt-devel mingw-w64-x86_64-python mingw-w64-x86_64-python-pip mingw-w64-x86_64-python-pandas python-devel mingw-w64-x86_64-python3-numpy mingw-w64-x86_64-python-pep517
 
 
 
@@ -116,6 +116,7 @@ echo '
 '
 path_venv="$path_repo/venv"
 echo "Now using python (t1): `which python`"
+python -m pip install -U setuptools pip wheel
 
 pip install virtualenv