YunoHost-Apps/searx_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/searx_ynh.git synced 2024-09-03 20:16:30 +02:00
Code Issues Activity Actions

Dunno what the heck with the venv, let's try to switch to a more standard workflow ...

Browse source
This commit is contained in:
Alexandre Aubin 2023-12-02 23:07:19 +01:00
parent daa1950574
commit eb92969ccd
3 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
conf/uwsgi.ini
View file

@ -26,8 +26,8 @@ route-run = fixpathinfo:
module = searx.webapp module = searx.webapp
# Virtualenv and python path # Virtualenv and python path
virtualenv = __INSTALL_DIR__ virtualenv = __INSTALL_DIR__/venv
pythonpath = __INSTALL_DIR__ pythonpath = __INSTALL_DIR__/venv
chdir = __INSTALL_DIR__/searx/ chdir = __INSTALL_DIR__/searx/
# The variable holding flask application # The variable holding flask application

9
scripts/install
View file

@ -36,10 +36,11 @@ ynh_add_nginx_config "path_no_root"
#================================================= #=================================================
ynh_script_progression --message="Installing Searx..." --weight=2 ynh_script_progression --message="Installing Searx..." --weight=2
python3 -m venv --system-site-packages "$install_dir" pushd $install_dir
set +u; source $install_dir/bin/activate; set -u python3 -m venv venv
pip3 install -U pip setuptools wheel pyyaml --no-cache-dir venv/bin/pip3 install -U pip setuptools wheel pyyaml --no-cache-dir
pip3 install --requirement $install_dir/requirements-ynh.txt --no-cache-dir venv/bin/pip3 install --requirement $install_dir/requirements-ynh.txt --no-cache-dir
popd
#================================================= #=================================================
# CONFIGURE SEARX # CONFIGURE SEARX

14
scripts/upgrade
View file

@ -67,20 +67,24 @@ ynh_add_nginx_config "path_no_root"
ynh_script_progression --message="Upgrading Searx..." --weight=7 ynh_script_progression --message="Upgrading Searx..." --weight=7
# Clean venv if it still on python2 # Clean venv if it still on python2
if [ ! -e $install_dir/bin/python3 ] if [ -e $install_dir/bin ] && [ ! -e $install_dir/bin/python3 ]
then then
ynh_regex_secure_remove --file=$install_dir/lib/ --regex='python[^/.]*' ynh_regex_secure_remove --file=$install_dir/lib/ --regex='python[^/.]*'
ynh_regex_secure_remove --file=$install_dir/lib64/ --regex='python[^/.]*' ynh_regex_secure_remove --file=$install_dir/lib64/ --regex='python[^/.]*'
ynh_regex_secure_remove --file=$install_dir/share/python-wheels ynh_regex_secure_remove --file=$install_dir/share/python-wheels
fi fi
ynh_regex_secure_remove --file=$install_dir/lib/python3/site-packages/setuptools ynh_regex_secure_remove --file=$install_dir/lib/python3/site-packages/setuptools
ynh_regex_secure_remove --file=$install_dir/lib/python3/site-packages/ --regex='setuptools-[^/.]*' ynh_regex_secure_remove --file=$install_dir/lib/python3/site-packages/ --regex='setuptools-[^/.]*'
python3 -m venv --system-site-packages "$install_dir" ynh_regex_secure_remove --file=$install_dir/venv/lib/python3/site-packages/setuptools
ynh_regex_secure_remove --file=$install_dir/venv/lib/python3/site-packages/ --regex='setuptools-[^/.]*'
set +u; source $install_dir/bin/activate; set -u pushd $install_dir
pip3 install -U setuptools python3 -m venv venv
pip3 install --requirement $install_dir/requirements-ynh.txt --upgrade venv/bin/pip3 install -U pip setuptools wheel pyyaml --no-cache-dir
venv/bin/pip3 install --requirement $install_dir/requirements-ynh.txt --no-cache-dir
popd
chown -R $app: "$install_dir" chown -R $app: "$install_dir"