Merge pull request #82 from YunoHost-Apps/1.0.0

1.0.0

README.md

@@ -4,12 +4,12 @@
 [![Install Searx with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=searx)
 
 > *This package allow you to install Searx quickly and simply on a YunoHost server.  
-If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.*
+If you don't have YunoHost, please see [here](https://yunohost.org/install) to know how to install and enjoy it.*
 
 ## Overview
 Searx is a privacy-respecting, hackable metasearch engine.
 
-**Shipped version:** 0.18.0
+**Shipped version:** 1.0.0
 
 ## Screenshot
 
@@ -31,8 +31,8 @@ Searx is a privacy-respecting, hackable metasearch engine.
 
 #### Supported architectures
 
-* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/searx%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/searx/)
+* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/searx.svg)](https://ci-apps.yunohost.org/ci/apps/searx/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/searx%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/searx/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/searx.svg)](https://ci-apps-arm.yunohost.org/ci/apps/searx/)
 
 ## Limitations
 

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/searx/searx/archive/v0.18.0.tar.gz
+SOURCE_URL=https://github.com/searx/searx/archive/refs/tags/1.0.0.tar.gz
-SOURCE_SUM=d22430ad92262d9114ad169e001975fe5195afdcc679d6f6bf030e0c1a5b79f0
+SOURCE_SUM=4587acc9bd2bf428fe9ac8e4d79d3637dac308a8e5bdeee4f0bae85bfe5c67fe
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

manifest.json

@@ -7,7 +7,7 @@
 		"fr": "Méta-moteur de recherche respectueux de la vie privée et bidouillable", 
 		"de": "Meta-Suchmaschine, die den Privatsphäre wahrt und 'hackable' ist."
 	},
-	"version": "0.18.0~ynh3",
+	"version": "1.0.0~ynh1",
 	"url": "https://searx.github.io/searx/",
 	"license": "AGPL-3.0-or-later",
 	"maintainer": {

scripts/_common.sh

@@ -5,7 +5,7 @@
 #=================================================
 
 # dependencies used by the app
-pkg_dependencies="git build-essential libxslt-dev python3-dev python3-venv python3-cffi python3-babel zlib1g-dev libffi-dev libssl-dev python3-lxml uwsgi uwsgi-plugin-python3"
+pkg_dependencies="git build-essential libxslt-dev python3-dev python3-venv python3-cffi python3-babel zlib1g-dev libffi-dev libssl-dev python3-lxml uwsgi uwsgi-plugin-python3 shellcheck"
 
 #=================================================
 # UWSGI HELPERS

scripts/install

@@ -92,7 +92,10 @@ ynh_script_progression --message="Installing Searx..." --weight=2
 
 python3 -m venv --system-site-packages "$final_path"
 set +u; source $final_path/bin/activate; set -u
+pip3 install -U pip
 pip3 install -U setuptools
+pip3 install -U wheel
+pip3 install -U pyyaml
 pip3 install --requirement $final_path/requirements-ynh.txt
 
 #=================================================
@@ -100,16 +103,9 @@ pip3 install --requirement $final_path/requirements-ynh.txt
 #=================================================
 ynh_script_progression --message="Configuring Searx..." --weight=2
 
-# Change instance name
+secret_key=$(ynh_string_random)
-ynh_replace_string --match_string="instance_name : \"searx\"" --replace_string="instance_name : \"YunoSearx\"" --target_file="$final_path/searx/settings.yml"
 
-# Generate a secret key
+ynh_add_config --template="../conf/settings.yml" --destination="$final_path/searx/settings.yml"
-ynh_replace_string --match_string="secret_key : \"ultrasecretkey\"" --replace_string="secret_key : \"$(ynh_string_random)\"" --target_file="$final_path/searx/settings.yml"
-
-# Modify the base_url parameter
-#ynh_replace_string --match_string="base_url : False" --replace_string="base_url : https://${domain}${path_url%/}/" --target_file="$final_path/searx/settings.yml"
-
-ynh_store_file_checksum --file="$final_path/searx/settings.yml"
 
 #=================================================
 # SET PERMISSIONS ON SEARX DIRECTORY

sources/extra_files/app/requirements-ynh.txt

@@ -1,21 +1,21 @@
 # Have a look to https://github.com/searx/searx/blob/master/requirements.txt
 certifi==2020.12.05
-babel==2.9.0
+babel==2.9.1
 flask-babel==2.0.0
 flask==1.1.2
 idna==2.10
-jinja2==2.11.2
+jinja2==2.11.3
-lxml==4.6.2
+lxml==4.6.3
-pygments==2.1.3
+pygments==2.8.0
-pyopenssl==19.1.0
 python-dateutil==2.8.1
 pyyaml==5.4.1
 requests[socks]==2.25.1
-cryptography==3.1.1
+langdetect==1.0.8
+# cryptography==3.2
 
-# Additionnals requirements
+# # Additionnals requirements
-markupsafe>=0.23
+# markupsafe>=0.23
-ndg-httpsclient>=0.4.2
+# ndg-httpsclient>=0.4.2
-pyasn1>=0.2.3
+# pyasn1>=0.2.3
-pyasn1-modules>=0.0.9
+# pyasn1-modules>=0.0.9
-#cffi>=1.12.1
+## cffi>=1.12.1