From 9b13c95f77f1d2929841ec889d5c46173bc9033b Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Tue, 2 Mar 2021 19:54:24 +0100
Subject: [PATCH] Re-add --others_var in fail2ban and systemd helpers for
 backward compatibility...

---
 data/helpers.d/fail2ban | 7 +++++--
 data/helpers.d/systemd  | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/data/helpers.d/fail2ban b/data/helpers.d/fail2ban
index c9322d067..f8b2b1761 100644
--- a/data/helpers.d/fail2ban
+++ b/data/helpers.d/fail2ban
@@ -61,12 +61,13 @@
 # Requires YunoHost version 3.5.0 or higher.
 ynh_add_fail2ban_config () {
     # Declare an array to define the options of this helper.
-    local legacy_args=lrmpt
-    local -A args_array=( [l]=logpath= [r]=failregex= [m]=max_retry= [p]=ports= [t]=use_template)
+    local legacy_args=lrmptv
+    local -A args_array=( [l]=logpath= [r]=failregex= [m]=max_retry= [p]=ports= [t]=use_template  [v]=others_var=)
     local logpath
     local failregex
     local max_retry
     local ports
+    local others_var
     local use_template
     # Manage arguments with getopts
     ynh_handle_getopts_args "$@"
@@ -74,6 +75,8 @@ ynh_add_fail2ban_config () {
     ports=${ports:-http,https}
     use_template="${use_template:-0}"
 
+    [[ -z "$others_var" ]] || ynh_print_warn --message="Packagers: using --others_var is unecessary since Yunohost 4.2"
+
     if [ $use_template -ne 1 ]
     then
         # Usage 1, no template. Build a config file from scratch.
diff --git a/data/helpers.d/systemd b/data/helpers.d/systemd
index f8e21bfbd..b43b593fa 100644
--- a/data/helpers.d/systemd
+++ b/data/helpers.d/systemd
@@ -13,15 +13,18 @@
 # Requires YunoHost version 2.7.11 or higher.
 ynh_add_systemd_config () {
     # Declare an array to define the options of this helper.
-    local legacy_args=st
-    local -A args_array=( [s]=service= [t]=template=)
+    local legacy_args=stv
+    local -A args_array=( [s]=service= [t]=template=  [v]=others_var=)
     local service
     local template
+    local others_var
     # Manage arguments with getopts
     ynh_handle_getopts_args "$@"
     local service="${service:-$app}"
     local template="${template:-systemd.service}"
 
+    [[ -z "$others_var" ]] || ynh_print_warn --message="Packagers: using --others_var is unecessary since Yunohost 4.2"
+
     ynh_add_config --template="$YNH_APP_BASEDIR/conf/$template" --destination="/etc/systemd/system/$service.service"
 
     systemctl enable $service --quiet