Merge pull request #76 from YunoHost-Apps/patch

Fix install

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~ynh2",
+	"version": "0.18.0~ynh3",
 	"url": "https://searx.github.io/searx/",
 	"license": "AGPL-3.0-or-later",
 	"maintainer": {

pull_request_template.md

@@ -11,14 +11,6 @@
 - [ ] Upgrade from last version tested.
 - [ ] Can be reviewed and tested.
 
-## Validation
+## Package_check results
 ---
-*Minor decision*
-- **Upgrade previous version** : 
-- [ ] **Code review** : 
-- [ ] **Approval (LGTM)** : 
-- [ ] **Approval (LGTM)** : 
-- **CI succeeded** : 
-[![Build Status](https://ci-apps-hq.yunohost.org/jenkins/job/searx_ynh%20PR-NUM-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/searx_ynh%20PR-NUM-/)  
-*Please replace '-NUM-' in this link by the PR number.*  
-When the PR is marked as ready to merge, you have to wait for 3 days before really merging it.
+* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"*

scripts/install

@@ -54,7 +54,7 @@ ynh_app_setting_set --app=$app --key=is_public --value=$is_public
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Installing dependencies..." --weight=35
+ynh_script_progression --message="Installing dependencies..." --weight=2
 
 ynh_install_app_dependencies $pkg_dependencies
 
@@ -116,7 +116,7 @@ ynh_store_file_checksum --file="$final_path/searx/settings.yml"
 # SET PERMISSIONS ON SEARX DIRECTORY
 #=================================================
 
-chown -R $app: "$final_path"
+chown -R $app: $final_path
 
 #=================================================
 # CONFIGURE UWSGI FOR SEARX
@@ -138,12 +138,12 @@ ynh_systemd_action --service_name=uwsgi-app@$app.service --action=start --line_m
 #=================================================
 # SETUP SSOWAT
 #=================================================
-ynh_script_progression --message="Configuring SSOwat..." --weight=2
+ynh_script_progression --message="Configuring permissions..." --weight=2
 
 # Make app public if necessary or protect it
 if [ $is_public -eq 1 ]
 then
-	ynh_permission_update --permission "main" --add "visitors"
+	ynh_permission_update --permission="main" --add="visitors"
 fi
 
 #=================================================

scripts/upgrade

@@ -47,6 +47,13 @@ if [ -z "$final_path" ]; then
 	ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 fi
 
+# Cleaning legacy permissions
+if ynh_legacy_permissions_exists; then
+	ynh_legacy_permissions_delete_all
+
+	ynh_app_setting_delete --app=$app --key=is_public
+fi
+
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================

sources/extra_files/app/requirements-ynh.txt

@@ -9,8 +9,9 @@ lxml==4.6.2
 pygments==2.1.3
 pyopenssl==19.1.0
 python-dateutil==2.8.1
-pyyaml==5.3.1
-requests[socks]==2.25.0
+pyyaml==5.4.1
+requests[socks]==2.25.1
+cryptography==3.1.1
 
 # Additionnals requirements
 markupsafe>=0.23