From b8afa6ee3ca7ef95e4632cf7b5ca4dae54c3fb03 Mon Sep 17 00:00:00 2001 From: Matthias Wirth Date: Sun, 12 Jul 2020 17:39:09 +0200 Subject: [PATCH] more mlat install changes (python venv is somewhat annoying) --- setup.sh | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/setup.sh b/setup.sh index da33489..b6b9d26 100755 --- a/setup.sh +++ b/setup.sh @@ -205,19 +205,12 @@ fi sleep 0.25 - MLAT_FAIL="false" rm "$VENV" -rf - /usr/bin/python3 -m venv $VENV >> $LOGFILE 2>&1 || MLAT_FAIL="true" - echo 36 - source $VENV/bin/activate >> $LOGFILE 2>&1 || MLAT_FAIL="true" - echo 38 - python3 setup.py build >> $LOGFILE 2>&1 || MLAT_FAIL="true" - echo 40 - python3 setup.py install >> $LOGFILE 2>&1 || MLAT_FAIL="true" - - if [[ $MLAT_FAIL == "false" ]]; then - git rev-parse HEAD > $IPATH/mlat_version - fi + /usr/bin/python3 -m venv $VENV >> $LOGFILE 2>&1 && echo 36 \ + && source $VENV/bin/activate >> $LOGFILE 2>&1 && echo 38 \ + && python3 setup.py build >> $LOGFILE 2>&1 && echo 40 \ + && python3 setup.py install >> $LOGFILE 2>&1 \ + && git rev-parse HEAD > $IPATH/mlat_version fi