From 8dac1e73da2f389300da071edc0a7bb880176b57 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Mon, 4 Sep 2017 09:23:21 +0200 Subject: [PATCH] Better handling of cases, text is more clear --- bin/pgadmin4 | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/bin/pgadmin4 b/bin/pgadmin4 index be596e7..e71a92c 100755 --- a/bin/pgadmin4 +++ b/bin/pgadmin4 @@ -4,16 +4,18 @@ PGADMINVENV="pgadmin4" VENVDIR="$HOME/.virtualenvs/${PGADMINVENV}" source /usr/share/virtualenvwrapper/virtualenvwrapper.sh -if [ -d "$VENVDIR" ]; then +if [ ! -d "$VENVDIR" ] || [ ! -e ${VENVDIR}lib/python2.7/site-packages/pgadmin4/pgAdmin4.py ]; then + mkvirtualenv "${PGADMINVENV}" + # Install + echo + echo "Download the wheel from https://www.pgadmin.org/download/pgadmin-4-python-wheel/" + echo + echo "Install with:" + echo "workon pgadmin4" + echo "pip install ./pgadmin4-1.6-py2.py3-none-any.whl" + echo "echo "SERVER_MODE = False" >> ${VENVDIR}/lib/python2.7/site-packages/pgadmin4/config_local.py" +else workon "${PGADMINVENV}" # Start python ${VENVDIR}lib/python2.7/site-packages/pgadmin4/pgAdmin4.py -else - mkvirtualenv "${PGADMINVENV}" - # Install - echo "Download the wheel from https://www.pgadmin.org/download/pgadmin-4-python-wheel/" - echo "Install with:" - echo "# workon pgadmin4" - echo "pip install ./pgadmin4-1.6-py2.py3-none-any.whl" - echo "echo "SERVER_MODE = False" >> ${VENVDIR}/lib/python2.7/site-packages/pgadmin4/config_local.py" fi