From 7bdb1712b9d5f6fd63d824229f3b20171653feef Mon Sep 17 00:00:00 2001 From: Greg Gauthier Date: Sat, 10 Oct 2020 16:00:11 +0100 Subject: [PATCH] fixing bash installer --- install.sh | 16 ++++++++-------- rundemo.sh | 6 ++++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/install.sh b/install.sh index 1dc218c..9ac0143 100755 --- a/install.sh +++ b/install.sh @@ -5,13 +5,13 @@ PY=$(which python3) HC=$(which hoverctl) echo "PREPARING PYTHON3 ENVIRONMENT..." -if [[ "$PY" = "python3 not found" ]]; +if [ "$PY" = "python3 not found" ]; then echo "No python3 installation found. Attempting install now..." - if [[ "$OS" = "Darwin" ]]; then + if [ "$OS" = "Darwin" ]; then $(brew install python3) fi - if [[ "$OS" = "Linux" ]]; then + if [ "$OS" = "Linux" ]; then $(sudo apt install python3) fi PY=$(which python3) @@ -19,13 +19,13 @@ fi echo "PREPARING HOVERFLY INSTALLATION..." # shellcheck disable=SC2039 -if [[ "$HC" = "hoverctl not found" ]]; +if [ "$HC" = "hoverctl not found" ]; then echo "HoverFly CLI binary not found. Attempting install now..." - if [[ "$OS" = "Darwin" ]]; then + if [ "$OS" = "Darwin" ]; then $(brew install hoverfly) fi - if [[ "$OS" = "Linux" ]]; then + if [ "$OS" = "Linux" ]; then $(wget https://github.com/SpectoLabs/hoverfly/releases/download/v1.0.0/hoverfly_bundle_linux_amd64.zip) $(unzip hoverfly_bundle_linux_amd64.zip) $(sudo mv hoverctl /usr/local/bin) @@ -39,7 +39,7 @@ PENV=$(${PY} -m pip freeze|grep -i pipenv) PYVER=$(${PY} --version) echo "${PYVER}" -if [[ -z "$PENV" && "$PENV"=" " ]]; +if [ -z "$PENV" ] && [ "$PENV"=" " ]; then echo "Installing pipenv for python3..." ${PY} -m pip install pipenv @@ -51,4 +51,4 @@ fi echo "Dependency Graph:" pipenv graph -echo "ALL SYSTEMS GO!" \ No newline at end of file +echo "ALL SYSTEMS GO!" diff --git a/rundemo.sh b/rundemo.sh index ee84e2f..5be9e60 100755 --- a/rundemo.sh +++ b/rundemo.sh @@ -1,4 +1,6 @@ #!/usr/bin/env sh -pipenv run python3 app/simple.py -pipenv run python3 -m pytest tests/test_hov.py --verbose --show-capture=all \ No newline at end of file +python3 -m pip install pipenv +pipenv run ./install.sh +pipenv run python3 app/simple.py & +pipenv run python3 -m pytest tests/test_hov.py --verbose --show-capture=all