diff --git a/scripts/_common.sh b/scripts/_common.sh index 999eae6..4765e90 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -24,7 +24,8 @@ fi function refresh_collect() { - python3 manage_${app}.py collectstatic --noinput -l + pushd $install_dir + venv/bin/python3 manage_${app}.py collectstatic --noinput -l rm -rf ${app}/static/static rm -rf ${app}/static/plugins rm -rf ${app}/static/tmp @@ -34,4 +35,5 @@ function refresh_collect() rm -rf ${app}/static/settings.py rm -rf ${app}/static/django_error.log rm -rf ${app}/static/__init__.py + popd } diff --git a/scripts/install b/scripts/install index 0d9ec42..f622968 100644 --- a/scripts/install +++ b/scripts/install @@ -10,24 +10,15 @@ ynh_script_progression --message="Installing app..." --weight=5 pushd $install_dir python3 -m venv venv -. venv/bin/activate -pip3 install -U lucterios lucterios-standard lucterios-contacts lucterios-documents -pip3 install -U diacamma-asso diacamma-syndic diacamma-financial -pip3 install -U gunicorn psycopg2-binary psycopg2 -lucterios_admin.py installed -sitepackpath=$install_dir/venv/lib/python3.9/site-packages -export PYTHONPATH="$sitepackpath:$sitepackpath/lucterios:$sitepackpath/diacamma:$sitepackpath/diacamma/accounting:$sitepackpath/diacamma/asso:$sitepackpath/diacamma/condominium:$sitepackpath/diacamma/event:$sitepackpath/diacamma/invoice:$sitepackpath/diacamma/member:$sitepackpath/diacamma/payoff:$sitepackpath/diacamma/syndic" - -ls -l $install_dir/venv/lib/python*/site-packages/lucterios -ls -l $install_dir/venv/lib/python*/site-packages/diacamma -ls -l $install_dir/venv/lib/python*/site-packages/diacamma/member -ynh_script_progression --message=" >> PYTHONPATH=${PYTHONPATH}" -lucterios_admin.py add -n ${app} -p "${APPLITYPE}" -m "${MODULES}" -d "${DATABASE}" -e '{"LANGUAGES":"'${language}'"}' +venv/bin/pip3 install -U lucterios lucterios-standard lucterios-contacts lucterios-documents +venv/bin/pip3 install -U diacamma-asso diacamma-syndic diacamma-financial +venv/bin/pip3 install -U gunicorn psycopg2-binary psycopg2 +venv/bin/lucterios_admin.py installed +venv/bin/lucterios_admin.py add -n ${app} -p "${APPLITYPE}" -m "${MODULES}" -d "${DATABASE}" -e '{"LANGUAGES":"'${language}'"}' +popd refresh_collect -popd - chmod 400 "$install_dir/" chown ${app}:${app} "$install_dir/" diff --git a/scripts/upgrade b/scripts/upgrade index 79dca16..e5ca295 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -43,13 +43,12 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app ynh_script_progression --message="Updating Diacamma..." pushd $install_dir -. venv/bin/activate -lucterios_admin.py check -lucterios_admin.py update -lucterios_admin.py refreshall +venv/bin/lucterios_admin.py check +venv/bin/lucterios_admin.py update +venv/bin/lucterios_admin.py refreshall +popd refresh_collect -popd chmod 400 "$install_dir/" chown ${app}:${app} "$install_dir/"