updates

bin/komrade-app

@@ -8,11 +8,12 @@ export KOMRADE_SHOW_LOG=0
 
 SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-$SCRIPTPATH/komrade-activate
+source "$SCRIPTPATH/komrade-activate"
+# echo "`which pip`"
 
 path=`realpath "$SCRIPTPATH/../komrade/app/main.py"`
-pathvenv=`realpath "$SCRIPTPATH/../../venv/bin/activate"`
-source $pathvenv
+# pathvenv=`realpath "$SCRIPTPATH/../../venv/bin/activate"`
+# source $pathvenv
 
 python "$path" $*
 

script/install

@@ -141,8 +141,12 @@ then
 fi
 
 
+
 # activate conda
 export PATH="$path_conda/bin:$PATH"
+
+source "$path_conda/etc/profile.d/conda.sh"
+
 condaexec="conda"
 pythonexec="python"
 
@@ -157,7 +161,10 @@ path_venv="$path_repo/venv"
 cd $path_repo
 echo "Now using python 1: `which python`"
 $condaexec create -y -p "$path_venv" python=3.7 cartopy pip virtualenv
-$condaexec activate "$path_venv"
+
+#$condaexec activate "$path_venv"
+
+
 echo "Now using python 2: `which python`"
 # $pythonexec -m pip install virtualenv
 # $pythonexec -m virtualenv venv