From 0d2aee061a07982bbb9c7357ef7425864d593ce5 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Holcroft Date: Tue, 6 Aug 2019 08:00:46 +0200 Subject: [PATCH] replace python-virtualenv by virtualenv --- manifest.json | 2 +- scripts/_common.sh | 2 ++ scripts/install | 3 +-- scripts/restore | 3 +-- scripts/upgrade | 3 +-- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/manifest.json b/manifest.json index 4b10ff0..1f492f5 100644 --- a/manifest.json +++ b/manifest.json @@ -15,7 +15,7 @@ "requirements": { "yunohost": ">= 3.5.0" }, - "version": "0.13.3~ynh3", + "version": "0.13.3~ynh4", "multi_instance": true, "services": [ "nginx" diff --git a/scripts/_common.sh b/scripts/_common.sh index c92fb21..8477123 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -1,5 +1,7 @@ #!/bin/bash +pkg_dependencies="dh-autoreconf python-pip python-dev python-lxml python-imaging virtualenv" + # INFOS # n (Node version management) utilise la variable PATH pour stocker le path de la version de node à utiliser. # C'est ainsi qu'il change de version diff --git a/scripts/install b/scripts/install index 7e26173..02580c5 100644 --- a/scripts/install +++ b/scripts/install @@ -64,8 +64,7 @@ ynh_app_setting_set "$app" salt "$salt" # INSTALL DEPENDENCIES #================================================= -ynh_install_app_dependencies dh-autoreconf \ - python-pip python-dev python-lxml python-imaging python-virtualenv +ynh_install_app_dependencies $pkg_dependencies #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE diff --git a/scripts/restore b/scripts/restore index c0cdd15..f047940 100644 --- a/scripts/restore +++ b/scripts/restore @@ -71,8 +71,7 @@ chmod 600 "$final_path/config.ini" #================================================= # Define and install dependencies -ynh_install_app_dependencies dh-autoreconf \ - python-pip python-dev python-lxml python-imaging python-virtualenv +ynh_install_app_dependencies $pkg_dependencies #================================================= # INSTALL NODEJS diff --git a/scripts/upgrade b/scripts/upgrade index da9e276..369aa45 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -71,8 +71,7 @@ path_url=$(ynh_normalize_url_path "$path_url") # INSTALL DEPENDENCIES #================================================= -ynh_install_app_dependencies dh-autoreconf \ - python-pip python-dev python-lxml python-imaging python-virtualenv +ynh_install_app_dependencies $pkg_dependencies #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE