From 96dbbbedad06416ac4acc7c87c44bc123479d7f0 Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackc_dev@crudelis.fr>
Date: Tue, 24 Apr 2018 16:34:43 +0200
Subject: [PATCH] Fix upgrade

---
 scripts/install                              |  2 +-
 scripts/upgrade                              |  5 ++--
 sources/extra_files/app/requirements-ynh.txt | 30 +++++++++++---------
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/scripts/install b/scripts/install
index 41d6a96..530ed8e 100644
--- a/scripts/install
+++ b/scripts/install
@@ -94,7 +94,7 @@ ynh_setup_source "$final_path"
 #=================================================
 
 virtualenv --system-site-packages "$final_path"
-bash -c "source $final_path/bin/activate && pip install -U pip setuptools && pip install --requirement $final_path/requirements-ynh.txt"
+bash -c "source $final_path/bin/activate && pip install -U setuptools && pip install --requirement $final_path/requirements-ynh.txt"
 
 #=================================================
 # CONFIGURE SEARX
diff --git a/scripts/upgrade b/scripts/upgrade
index 09f377d..2a9c462 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -96,9 +96,10 @@ ynh_system_user_create $app
 # UPGRADE SEARX IN ITS VIRTUALENV
 #=================================================
 
-rm -r $final_path/lib/python2.7/site-packages/{pip,setuptools} $final_path/lib/python2.7/site-packages/setuptools-* $final_path/lib/python2.7/site-packages/pip-*
+rm -r $final_path/lib/python2.7/site-packages/setuptools $final_path/lib/python2.7/site-packages/setuptools-*
+rm -rf $final_path/lib/python2.7/site-packages/pip $final_path/lib/python2.7/site-packages/pip-*
 virtualenv --system-site-packages "$final_path"
-bash -c "source $final_path/bin/activate && pip install -U pip setuptools && pip install --requirement $final_path/requirements-ynh.txt --upgrade"
+bash -c "source $final_path/bin/activate && pip install -U setuptools && pip install --requirement $final_path/requirements-ynh.txt --upgrade"
 
 #=================================================
 # CONFIGURE SEARX
diff --git a/sources/extra_files/app/requirements-ynh.txt b/sources/extra_files/app/requirements-ynh.txt
index a821ba1..d0a8eef 100644
--- a/sources/extra_files/app/requirements-ynh.txt
+++ b/sources/extra_files/app/requirements-ynh.txt
@@ -1,14 +1,18 @@
-certifi==2016.9.26
-flask==0.12
-flask-babel==0.11.1
-# lxml==3.7.1
-markupsafe==0.23
-ndg-httpsclient==0.4.2
-pyasn1==0.1.9
-pyasn1-modules==0.0.8
+# Have a look to https://github.com/asciimoo/searx/blob/master/requirements.txt for each upgrade of Searx
+certifi==2017.11.5
+flask==0.12.2
+flask-babel==0.11.2
+# lxml==4.1.1
+idna==2.5
 pygments==2.1.3
-pyopenssl==16.2.0
-python-dateutil==2.5.3
-pyyaml==3.11
-requests[socks]==2.12.4
-cffi>=1.6
\ No newline at end of file
+pyopenssl==17.4.0
+python-dateutil==2.6.1
+pyyaml==3.12
+requests[socks]==2.18.4
+
+# Additionnals requirements
+markupsafe>=0.23
+ndg-httpsclient>=0.4.2
+pyasn1>=0.1.9
+pyasn1-modules>=0.0.8
+cffi>=1.6