From c100968d8b670e4b664f8aedffbb9dac3815bc72 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Sat, 17 Jun 2017 17:37:16 +0200
Subject: [PATCH] Advertise helpers temporary inclusion in _common.sh

---
 scripts/_common.sh | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 069747c..763ede3 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -1,5 +1,11 @@
 #!/bin/bash
 
+# =============================================================================
+#                     YUNOHOST 2.6 FORTHCOMING HELPERS
+# (will be part of YunoHost 2.6, so won't be necessary any more after 
+#  YunoHost 2.6 gets widespread)
+# =============================================================================
+
 # Normalize the url path syntax
 # Handle the slash at the beginning of path and its absence at ending
 # Return a normalized url path
@@ -532,6 +538,19 @@ ynh_backup_if_checksum_is_different () {
 	fi
 }
 
+#####################################
+
+# This is not an official helper, just an abstract helper to prepare to the new one.
+ynh_restore_file () {
+	sudo cp -a "${backup_dir}$1" "$1"
+}
+
+# =============================================================================
+#                     YUNOHOST 2.6 FORTHCOMING HELPERS
+# (will be part of YunoHost 2.6, so won't be necessary any more after 
+#  YunoHost 2.6 gets widespread)
+# =============================================================================
+
 # Create a dedicated nginx config
 #
 # usage: ynh_add_nginx_config
@@ -638,10 +657,3 @@ ynh_remove_systemd_config () {
 		ynh_secure_remove "$finalsystemdconf"
 	fi
 }
-
-#####################################
-
-# This is not an official helper, just an abstract helper to prepare to the new one.
-ynh_restore_file () {
-	sudo cp -a "${backup_dir}$1" "$1"
-}