spacecruft
/
nopenpilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tools: use .python-version in setup scripts (#22511) 

* Updated tools installer to us.python-e version file

* Updated tools installer to use .python-version file

* fix path

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
pull/22512/head
Lasse Skov 2021-10-11 01:03:56 +02:00 committed by GitHub
parent a3c26a912a
commit 25def3cc34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/mac_setup.sh
View File

@ -1,5 +1,7 @@
#!/bin/bash -e
OP_ROOT=$(git rev-parse --show-toplevel)
# Install brew if required
if [[ $(command -v brew) == "" ]]; then
echo "Installing Hombrew"
@ -50,16 +52,17 @@ export PATH="$PATH:/usr/local/bin"
# OpenPilot environment variables
if [ -z "$OPENPILOT_ENV" ] && [ -n "$RC_FILE" ] && [ -z "$CI" ]; then
OP_DIR=$(git rev-parse --show-toplevel)
echo "export PATH=\"\$PATH:$HOME/.cargo/bin\"" >> $RC_FILE
echo "source $OP_DIR/tools/openpilot_env.sh" >> $RC_FILE
echo "source $OP_ROOT/tools/openpilot_env.sh" >> $RC_FILE
export PATH="$PATH:\"\$HOME/.cargo/bin\""
source "$OP_DIR/tools/openpilot_env.sh"
source "$OP_ROOT/tools/openpilot_env.sh"
echo "Added openpilot_env to RC file: $RC_FILE"
fi
pyenv install -s 3.8.5
pyenv global 3.8.5
# install python
PYENV_PYTHON_VERSION=$(cat $OP_ROOT/.python-version)
pyenv install -s ${PYENV_PYTHON_VERSION}
pyenv global ${PYENV_PYTHON_VERSION}
pyenv rehash
eval "$(pyenv init -)"

10
tools/ubuntu_setup.sh
View File

@ -1,5 +1,7 @@
#!/bin/bash -e
OP_ROOT=$(git rev-parse --show-toplevel)
sudo apt-get update && sudo apt-get install -y --no-install-recommends \
autoconf \
build-essential \
@ -73,8 +75,7 @@ cd $HOME/openpilot
source ~/.bashrc
if [ -z "$OPENPILOT_ENV" ]; then
OP_DIR=$(git rev-parse --show-toplevel)
printf "\nsource %s/tools/openpilot_env.sh" "$OP_DIR" >> ~/.bashrc
printf "\nsource %s/tools/openpilot_env.sh" "$OP_ROOT" >> ~/.bashrc
source ~/.bashrc
echo "added openpilot_env to bashrc"
fi
@ -85,9 +86,10 @@ git submodule init
git submodule update
# install python
PYENV_PYTHON_VERSION=$(cat $OP_ROOT/.python-version)
PATH=$HOME/.pyenv/bin:$HOME/.pyenv/shims:$PATH
pyenv install -s 3.8.5
pyenv global 3.8.5
pyenv install -s ${PYENV_PYTHON_VERSION}
pyenv global ${PYENV_PYTHON_VERSION}
pyenv rehash
eval "$(pyenv init -)"