From 7d7e2683c52c4bb286994523a447512b7d0e2b93 Mon Sep 17 00:00:00 2001
From: marxzuckerburg <mz@marxzuckerburg.com>
Date: Sun, 4 Oct 2020 09:27:31 +0100
Subject: [PATCH] ??

---
 bin/comrad-activate |  1 +
 bin/comrad-app      |  1 +
 script/install      | 18 ++++++++++--------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/bin/comrad-activate b/bin/comrad-activate
index e7b19ac..4413c8b 100755
--- a/bin/comrad-activate
+++ b/bin/comrad-activate
@@ -11,6 +11,7 @@ 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/bin:$PATH"
 conda activate $path_venv
 python -m pip install -r $path_repo/requirements.txt
diff --git a/bin/comrad-app b/bin/comrad-app
index 77562c1..87ffb1a 100755
--- a/bin/comrad-app
+++ b/bin/comrad-app
@@ -15,6 +15,7 @@ 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/bin:$PATH"
 conda activate $path_venv
 
diff --git a/script/install b/script/install
index d2be757..f563662 100644
--- a/script/install
+++ b/script/install
@@ -224,14 +224,15 @@ then
 
 
 
-    arch="$(uname -m)"
-    if [ "$arch" = "x86_64" ]
-    then
-        curl https://repo.anaconda.com/miniconda/Miniconda3-py37_4.8.3-Windows-x86_64.exe -o miniconda.exe
-    else
-        curl https://repo.anaconda.com/miniconda/Miniconda3-py37_4.8.3-Windows-x86.exe -o miniconda.exe
+    if [ ! -f "miniconda.exe" ]
+        arch="$(uname -m)"
+        if [ "$arch" = "x86_64" ]
+        then
+            curl https://repo.anaconda.com/miniconda/Miniconda3-py37_4.8.3-Windows-x86_64.exe -o miniconda.exe
+        else
+            curl https://repo.anaconda.com/miniconda/Miniconda3-py37_4.8.3-Windows-x86.exe -o miniconda.exe
+        fi
     fi
-
     # ./miniconda.exe -b -f -p "$path_conda"
     # rm miniconda.exe
     # cmd "miniconda.exe /InstallationType=JustMe /RegisterPython=0 /S /D=$path_conda"
@@ -329,7 +330,8 @@ echo "Now using python (t3): `which python`"
 
 if [ "$machine" = "MinGw" ]
 then
-    env CC=/usr/bin/gcc python -m pip install -r requirements.txt
+    # env CC=/usr/bin/gcc python -m pip install -r requirements.txt
+    python -m pip install --only-binary :all: -r requirements.txt
 else
     python -m pip install -r requirements.txt
 fi