From 74f93c22e57e0174f67b570875c9e10bbca0a6c8 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Holcroft Date: Thu, 28 Dec 2017 09:39:44 +0100 Subject: [PATCH 1/3] Fix Installation --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 2be03c9..a9b3e1b 100755 --- a/scripts/install +++ b/scripts/install @@ -200,7 +200,7 @@ virtualenv "${final_path}/venv" ( set +eu source "${final_path}/venv/bin/activate" - "${final_path}/venv/bin/pip" install Weblate=="$current_version" + "${final_path}/venv/bin/pip" install Weblate=="$current_version" django==1.11.8 "${final_path}/venv/bin/pip" install pytz python-bidi PyYaML Babel pyuca pylibravatar pydns psycopg2 python-memcached # specific to YunoHost package: "${final_path}/venv/bin/pip" install django_sendmail_backend diff --git a/scripts/upgrade b/scripts/upgrade index 3d6a4f7..5d6467a 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -125,7 +125,7 @@ settings_diff="$final_path/settings.${previous_version}_${current_version}.diff" ( set +eu source "${final_path}/venv/bin/activate" - "${final_path}/venv/bin/pip" install Weblate=="$current_version" + "${final_path}/venv/bin/pip" install Weblate=="$current_version" django==1.11.8 "${final_path}/venv/bin/pip" install pytz python-bidi PyYaML Babel pyuca pylibravatar pydns psycopg2 python-memcached # specific to YunoHost package: "${final_path}/venv/bin/pip" install django_sendmail_backend From f7560ca25493e47e225fd9f6ed9927f4198af8aa Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Holcroft Date: Mon, 2 Apr 2018 20:42:42 +0200 Subject: [PATCH 2/3] Fix module import error of phply --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index a9b3e1b..3a201cb 100755 --- a/scripts/install +++ b/scripts/install @@ -201,7 +201,7 @@ virtualenv "${final_path}/venv" set +eu source "${final_path}/venv/bin/activate" "${final_path}/venv/bin/pip" install Weblate=="$current_version" django==1.11.8 - "${final_path}/venv/bin/pip" install pytz python-bidi PyYaML Babel pyuca pylibravatar pydns psycopg2 python-memcached + "${final_path}/venv/bin/pip" install pytz python-bidi PyYaML Babel pyuca pylibravatar pydns psycopg2 python-memcached phply # specific to YunoHost package: "${final_path}/venv/bin/pip" install django_sendmail_backend ) diff --git a/scripts/upgrade b/scripts/upgrade index 5d6467a..a370c1a 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -126,7 +126,7 @@ settings_diff="$final_path/settings.${previous_version}_${current_version}.diff" set +eu source "${final_path}/venv/bin/activate" "${final_path}/venv/bin/pip" install Weblate=="$current_version" django==1.11.8 - "${final_path}/venv/bin/pip" install pytz python-bidi PyYaML Babel pyuca pylibravatar pydns psycopg2 python-memcached + "${final_path}/venv/bin/pip" install pytz python-bidi PyYaML Babel pyuca pylibravatar pydns psycopg2 python-memcached phply # specific to YunoHost package: "${final_path}/venv/bin/pip" install django_sendmail_backend ) From dc037965b0fbc1bd59d352c4d2b71a97b1e4768f Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Holcroft Date: Mon, 2 Apr 2018 21:58:27 +0200 Subject: [PATCH 3/3] replace i386 by 386 fix #7 --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index 3a201cb..59795ce 100755 --- a/scripts/install +++ b/scripts/install @@ -132,6 +132,7 @@ chsh --shell /bin/bash "$app" arch=$(dpkg --print-architecture) # Rasberry Pi: Debian armhf (ARM hard float) refers to the ARMv7 [[ $arch = "armhf" ]] && arch="arm" +[[ $arch = "i386" ]] && arch="386" version="hub-linux-${arch}-2.3.0-pre10" file_bin="hub-linux-${arch}-2.3.0-pre10.tgz"