installer-fixes
quadrismegistus 4 years ago
parent 75bfa7de76
commit 233e0dac97

@ -79,38 +79,38 @@ echo '
3) setting up python... 3) setting up python...
' # '
# if ! command -v pyenv &> /dev/null # # if ! command -v pyenv &> /dev/null
if [ ! -d "$HOME/.pyenv" ] # if [ ! -d "$HOME/.pyenv" ]
then # then
echo "pyenv not installed. install?" # echo "pyenv not installed. install?"
read -p "[Y/n] " pyenv_yn # read -p "[Y/n] " pyenv_yn
if [ "$pyenv_yn" = "n" ]; then # if [ "$pyenv_yn" = "n" ]; then
echo "Not installing pyenv." # echo "Not installing pyenv."
else # else
export PYENV_ROOT="$HOME/.pyenv" # export PYENV_ROOT="$HOME/.pyenv"
export PATH="$PYENV_ROOT/bin:$PATH" # export PATH="$PYENV_ROOT/bin:$PATH"
echo "installing..." # echo "installing..."
curl -s https://pyenv.run | bash # curl -s https://pyenv.run | bash
echo "installing python 3.7.3..." # echo "installing python 3.7.3..."
#eval "$(pyenv init -)" # #eval "$(pyenv init -)"
#$HOME/.pyenv/bin/pyenv install 3.7.3 # #$HOME/.pyenv/bin/pyenv install 3.7.3
echo $'\n\n#pyenv config ###\n' >> ~/.bashrc # echo $'\n\n#pyenv config ###\n' >> ~/.bashrc
echo 'export PATH="$HOME/.pyenv/bin:$PATH"' >> ~/.bashrc # echo 'export PATH="$HOME/.pyenv/bin:$PATH"' >> ~/.bashrc
echo 'eval "$(pyenv init -)"' >> ~/.bashrc # echo 'eval "$(pyenv init -)"' >> ~/.bashrc
echo 'eval "$(pyenv virtualenv-init -)"' >> ~/.bashrc # echo 'eval "$(pyenv virtualenv-init -)"' >> ~/.bashrc
echo $'\n###################\n\n' >> ~/.bashrc # echo $'\n###################\n\n' >> ~/.bashrc
source ~/.bashrc # source ~/.bashrc
fi # fi
fi # fi
@ -125,30 +125,34 @@ echo '
## the pyenv way
cd $path_repo cd $path_repo
python3 -m pip install virtualenv
python3 -m virtualenv venv
source venv/bin/activate
python3 -m pip install -r requirements.txt
if command -v pyenv &> /dev/null # if command -v pyenv &> /dev/null
then # then
pyenv install -s # ## the pyenv way
pyenv local # pyenv install -s
VENV="venv" # pyenv local
VENV=${VENV#-} # VENV="venv"
echo "Python in use: `which python`" # VENV=${VENV#-}
echo "Python3 in use: `which python3`" # echo "Python in use: `which python`"
echo "Python in pyenv: `pyenv local`" # echo "Python3 in use: `which python3`"
pyenv virtualenv venv # echo "Python in pyenv: `pyenv local`"
# python3 -m venv $VENV # pyenv virtualenv venv
# . $VENV/bin/activate # # python3 -m venv $VENV
pyenv activate venv # # . $VENV/bin/activate
python -m pip install -U pip setuptools wheel # pyenv activate venv
python -m pip install -r requirements.txt # python -m pip install -U pip setuptools wheel
else # python -m pip install -r requirements.txt
python3 -m pip install virtualenv # else
python3 -m virtualenv venv # python3 -m pip install virtualenv
source venv/bin/activate # python3 -m virtualenv venv
python3 -m pip install -r requirements.txt # source venv/bin/activate
fi # python3 -m pip install -r requirements.txt
# fi

Loading…
Cancel
Save