diff --git a/install-centos.sh b/install-centos.sh index 8ba720994ba7c42134912c8b5d8b6ed32693b7c3..1e52cecb82b005b071f975b605e4c114f8597683 100755 --- a/install-centos.sh +++ b/install-centos.sh @@ -171,6 +171,10 @@ while [ $# -gt 0 ]; do shift 1 fod_dir="$PWD" venv_dir="$PWD/venv" + elif [ $# -ge 1 -a "$1" = "--here__with_venv_relative" ]; then + shift 1 + fod_dir="$PWD" + venv_dir="$PWD/../venv" elif [ $# -ge 1 -a "$1" = "--base_dir" ]; then shift 1 base_dir="$1" @@ -220,6 +224,13 @@ while [ $# -gt 0 ]; do #install_basesw_os=0 install_basesw_python=1 install_fodproper=1 + elif [ $# -ge 1 -a "$1" = "--fodproper1" ]; then + shift 1 + install_default_used=0 + + #install_basesw_os=0 + #install_basesw_python=0 + install_fodproper=1 elif [ $# -ge 1 -a \( "$1" = "--supervisor" -o "$1" = "--supervisord" \) ]; then shift 1 install_with_supervisord=1 @@ -611,16 +622,18 @@ elif [ "$install_fodproper" = 1 ]; then touch flowspy/settings_local.py fi - echo "$0: step 2.3: ensuring Python dependencies are installed" 1>&2 + if [ "$install_basesw_python" = 1 ]; then + echo "$0: step 2.3: ensuring Python dependencies are installed" 1>&2 - if [ "$install_basesw_python" = 1 ]; then #are we running in --both mode, i.e. for the venv init is run for the first time, i.e. the problematic package having issues with to new setuptools is not yet installed? - # fix for broken anyjson and cl - # TODO: fix this more cleanly - pip install 'setuptools<58' - fi + if [ "$install_basesw_python" = 1 ]; then #are we running in --both mode, i.e. for the venv init is run for the first time, i.e. the problematic package having issues with to new setuptools is not yet installed? + # fix for broken anyjson and cl + # TODO: fix this more cleanly + pip install 'setuptools<58' + fi - # actual proper installation of python requirements - pip install -r requirements.txt + # actual proper installation of python requirements + pip install -r requirements.txt + fi ## diff --git a/install-debian.sh b/install-debian.sh index ccd17692836984063a16e48be16d2a06ac852bc0..3dddbe45d059a87a55b3f98133bf1a9f8ff8d0c9 100755 --- a/install-debian.sh +++ b/install-debian.sh @@ -239,6 +239,10 @@ while [ $# -gt 0 ]; do shift 1 fod_dir="$PWD" venv_dir="$PWD/venv" + elif [ $# -ge 1 -a "$1" = "--here__with_venv_relative" ]; then + shift 1 + fod_dir="$PWD" + venv_dir="$PWD/../venv" elif [ $# -ge 1 -a "$1" = "--base_dir" ]; then shift 1 base_dir="$1" @@ -288,6 +292,13 @@ while [ $# -gt 0 ]; do #install_basesw_os=0 install_basesw_python=1 install_fodproper=1 + elif [ $# -ge 1 -a "$1" = "--fodproper1" ]; then + shift 1 + install_default_used=0 + + #install_basesw_os=0 + #install_basesw_python=0 + install_fodproper=1 elif [ $# -ge 1 -a \( "$1" = "--supervisor" -o "$1" = "--supervisord" \) ]; then shift 1 install_with_supervisord=1 @@ -484,6 +495,13 @@ fi ## +if [ "$try_install_docu" = 1 ]; then + echo "trying to install mkdocs for documentation" 1>&2 + apt-get -qqy install mkdocs +fi + +## + if [ -n "$install_mta" ]; then set -e @@ -722,16 +740,18 @@ elif [ "$install_fodproper" = 1 ]; then touch flowspy/settings_local.py fi - echo "$0: step 2.3: ensuring Python dependencies are installed" 1>&2 + if [ "$install_basesw_python" = 1 ]; then + echo "$0: step 2.3: ensuring Python dependencies are installed" 1>&2 - if [ "$install_basesw_python" = 1 ]; then #are we running in --both mode, i.e. for the venv init is run for the first time, i.e. the problematic package having issues with to new setuptools is not yet installed? - # fix for broken anyjson and cl - # TODO: fix this more cleanly - pip install 'setuptools==57.5.0' - fi + if [ "$install_basesw_python" = 1 ]; then #are we running in --both mode, i.e. for the venv init is run for the first time, i.e. the problematic package having issues with to new setuptools is not yet installed? + # fix for broken anyjson and cl + # TODO: fix this more cleanly + pip install 'setuptools==57.5.0' + fi - # actual proper installation of python requirements - pip install -r requirements.txt + # actual proper installation of python requirements + pip install -r requirements.txt + fi ##