diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-01 02:39:59 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-01 02:39:59 +0200 |
| commit | 2f0d6507292a27d647179fac9c45bbfa0f19b97e (patch) | |
| tree | d8d325c09e789ace3d1a538378d964512f72ad38 | |
| parent | 6719aa5986159b8f8823a629d0692baefcce5e5b (diff) | |
| parent | e8de7595c2e8a98418593e90b886e45a745e234a (diff) | |
| download | mitmproxy-2f0d6507292a27d647179fac9c45bbfa0f19b97e.tar.gz mitmproxy-2f0d6507292a27d647179fac9c45bbfa0f19b97e.tar.bz2 mitmproxy-2f0d6507292a27d647179fac9c45bbfa0f19b97e.zip | |
Merge branch 'master' into proxy-refactor-cb
| -rw-r--r-- | .env | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -1,5 +1,6 @@ -DIR="${0%/*}" -if [ -z "$VIRTUAL_ENV" ] && [ -f "$DIR/../venv.mitmproxy/bin/activate" ]; then +DIR="$( dirname "${BASH_SOURCE[0]}" )" +ACTIVATE_DIR="$(if [ -f "$DIR/../venv.mitmproxy/bin/activate" ]; then echo 'bin'; else echo 'Scripts'; fi;)" +if [ -z "$VIRTUAL_ENV" ] && [ -f "$DIR/../venv.mitmproxy/$ACTIVATE_DIR/activate" ]; then echo "Activating mitmproxy virtualenv..." - source "$DIR/../venv.mitmproxy/bin/activate" + source "$DIR/../venv.mitmproxy/$ACTIVATE_DIR/activate" fi |