From 9fc00160dc0c83901f2cd6d646055e30d01090cf Mon Sep 17 00:00:00 2001
From: quadrismegistus <ryan.heuser@gmail.com>
Date: Mon, 5 Oct 2020 11:36:28 +0100
Subject: [PATCH] updates

---
 bin/comrad-app | 5 ++---
 script/install | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/bin/comrad-app b/bin/comrad-app
index 87178f0..7e546bf 100755
--- a/bin/comrad-app
+++ b/bin/comrad-app
@@ -23,7 +23,7 @@ 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
+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"
 # export PATH="$path_lib/themis-master/build:/usr/local/bin:$PATH"
@@ -31,6 +31,7 @@ export PATH="$path_conda/bin:$PATH"
 
 conda activate $path_venv
 
+echo "Python: `which python`"
 
 
 # update?
@@ -42,7 +43,5 @@ fi
 
 
 
-
-
 python -m pip install -r $path_repo/requirements.txt -q
 python $path_repo/comrad/app/main.py
\ No newline at end of file
diff --git a/script/install b/script/install
index 7adecb8..e04e4ae 100644
--- a/script/install
+++ b/script/install
@@ -269,7 +269,7 @@ echo "Now using python (t1): `which python`"
 
 conda config --add channels conda-forge
 conda create -y -p "$path_venv" python=3.7 cartopy pip virtualenv rtree pyzbar wxpython
-# source "$path_conda/etc/profile.d/conda.sh"
+source "$path_conda/etc/profile.d/conda.sh"
 
 conda activate "$path_venv"