diff --git a/tools/openpilot_env.sh b/tools/openpilot_env.sh index 35d221613c..ccf76db2bc 100644 --- a/tools/openpilot_env.sh +++ b/tools/openpilot_env.sh @@ -1,11 +1,19 @@ if [ -z "$OPENPILOT_ENV" ]; then - export PATH="$HOME/.pyenv/bin:$PATH" - eval "$(pyenv init -)" - eval "$(pyenv virtualenv-init -)" - export PYTHONPATH="$HOME/openpilot" - export PATH="$PATH:$HOME/openpilot/external/capnp/bin" - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/openpilot/external/capnp/lib" + + unamestr=`uname` + if [[ "$unamestr" == 'Linux' ]]; then + export PATH="$HOME/.pyenv/bin:$PATH" + eval "$(pyenv init -)" + eval "$(pyenv virtualenv-init -)" + + export PATH="$PATH:$HOME/openpilot/external/capnp/bin" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/openpilot/external/capnp/lib" + elif [[ "$unamestr" == 'Darwin' ]]; then + # msgq doesn't work on mac + export ZMQ=1 + export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES + fi export OPENPILOT_ENV=1 fi diff --git a/tools/replay/ui.py b/tools/replay/ui.py index 0dfa36ac98..61f01dc4e2 100755 --- a/tools/replay/ui.py +++ b/tools/replay/ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import argparse import os import sys diff --git a/tools/replay/unlogger.py b/tools/replay/unlogger.py index 374cd0992f..227091fb29 100755 --- a/tools/replay/unlogger.py +++ b/tools/replay/unlogger.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import argparse import os import sys