Skip to content
Snippets Groups Projects
Commit cfe2fed6 authored by David Schmitz's avatar David Schmitz
Browse files

install*.sh: update

parent cc3e0fa3
Branches
No related tags found
No related merge requests found
...@@ -171,6 +171,10 @@ while [ $# -gt 0 ]; do ...@@ -171,6 +171,10 @@ while [ $# -gt 0 ]; do
shift 1 shift 1
fod_dir="$PWD" fod_dir="$PWD"
venv_dir="$PWD/venv" 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 elif [ $# -ge 1 -a "$1" = "--base_dir" ]; then
shift 1 shift 1
base_dir="$1" base_dir="$1"
...@@ -220,6 +224,13 @@ while [ $# -gt 0 ]; do ...@@ -220,6 +224,13 @@ while [ $# -gt 0 ]; do
#install_basesw_os=0 #install_basesw_os=0
install_basesw_python=1 install_basesw_python=1
install_fodproper=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 elif [ $# -ge 1 -a \( "$1" = "--supervisor" -o "$1" = "--supervisord" \) ]; then
shift 1 shift 1
install_with_supervisord=1 install_with_supervisord=1
...@@ -611,16 +622,18 @@ elif [ "$install_fodproper" = 1 ]; then ...@@ -611,16 +622,18 @@ elif [ "$install_fodproper" = 1 ]; then
touch flowspy/settings_local.py touch flowspy/settings_local.py
fi 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? 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 # fix for broken anyjson and cl
# TODO: fix this more cleanly # TODO: fix this more cleanly
pip install 'setuptools<58' pip install 'setuptools<58'
fi fi
# actual proper installation of python requirements # actual proper installation of python requirements
pip install -r requirements.txt pip install -r requirements.txt
fi
## ##
......
...@@ -239,6 +239,10 @@ while [ $# -gt 0 ]; do ...@@ -239,6 +239,10 @@ while [ $# -gt 0 ]; do
shift 1 shift 1
fod_dir="$PWD" fod_dir="$PWD"
venv_dir="$PWD/venv" 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 elif [ $# -ge 1 -a "$1" = "--base_dir" ]; then
shift 1 shift 1
base_dir="$1" base_dir="$1"
...@@ -288,6 +292,13 @@ while [ $# -gt 0 ]; do ...@@ -288,6 +292,13 @@ while [ $# -gt 0 ]; do
#install_basesw_os=0 #install_basesw_os=0
install_basesw_python=1 install_basesw_python=1
install_fodproper=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 elif [ $# -ge 1 -a \( "$1" = "--supervisor" -o "$1" = "--supervisord" \) ]; then
shift 1 shift 1
install_with_supervisord=1 install_with_supervisord=1
...@@ -484,6 +495,13 @@ fi ...@@ -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 if [ -n "$install_mta" ]; then
set -e set -e
...@@ -722,16 +740,18 @@ elif [ "$install_fodproper" = 1 ]; then ...@@ -722,16 +740,18 @@ elif [ "$install_fodproper" = 1 ]; then
touch flowspy/settings_local.py touch flowspy/settings_local.py
fi 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? 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 # fix for broken anyjson and cl
# TODO: fix this more cleanly # TODO: fix this more cleanly
pip install 'setuptools==57.5.0' pip install 'setuptools==57.5.0'
fi fi
# actual proper installation of python requirements # actual proper installation of python requirements
pip install -r requirements.txt pip install -r requirements.txt
fi
## ##
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment