2
0
mirror of https://github.com/ComradCollective/Comrad synced 2024-11-11 13:10:45 +00:00
This commit is contained in:
marxzuckerburg 2020-10-05 10:13:12 +01:00
parent 32ecf10736
commit 41e21a30b9
2 changed files with 8 additions and 9 deletions

View File

@ -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" ]

View File

@ -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