From 4607f0f3c2ad894006681a88e9a6e4be670de7c8 Mon Sep 17 00:00:00 2001
From: Jephte Clain <Jephte.Clain@univ-reunion.fr>
Date: Mon, 22 Mar 2021 10:06:30 +0400
Subject: [PATCH] =?UTF-8?q?possibilit=C3=A9=20de=20sp=C3=A9cifier=20compat?=
 =?UTF-8?q?=20bash=5Fcompletion=20si=20pas=20debian?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/bashrc.d/bash_completion.shared | 9 ++++++---
 lib/bashrc.d/nutools.userconf       | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/bashrc.d/bash_completion.shared b/lib/bashrc.d/bash_completion.shared
index c245252..ac80471 100644
--- a/lib/bashrc.d/bash_completion.shared
+++ b/lib/bashrc.d/bash_completion.shared
@@ -4,7 +4,10 @@
 if [ -n "$UTOOLS_BASH_COMPLETION" ]; then
     function __bash_completion_enabled() { return 1; }
     function __bash_completion_module_enabled() { return 1; }
-    if [ -f /etc/debian_version ]; then
+    _file=
+    if [ -n "$UTOOLS_BASH_COMPLETION_COMPAT" ]; then
+        _file="@@dest@@/lib/ulib/$UTOOLS_BASH_COMPLETION_COMPAT/bash_completion"
+    elif [ -f /etc/debian_version ]; then
         case "$(</etc/debian_version)" in
         6*|squeeze*)
             # le code suivant n'est compatible qu'avec debian squeeze (plus
@@ -17,9 +20,9 @@ if [ -n "$UTOOLS_BASH_COMPLETION" ]; then
             _file="@@dest@@/lib/ulib/bash41/bash_completion"
             ;;
         esac
-        [ -f "$_file" ] && source "$_file"
-        unset _file
     fi
+    [ -f "$_file" ] && source "$_file"
+    unset _file
     if __bash_completion_enabled; then
         for i in "@@dest@@/lib/completion.d/"*; do
             [ -f "$i" ] || continue
diff --git a/lib/bashrc.d/nutools.userconf b/lib/bashrc.d/nutools.userconf
index d75d954..8ec17f0 100644
--- a/lib/bashrc.d/nutools.userconf
+++ b/lib/bashrc.d/nutools.userconf
@@ -9,6 +9,7 @@
 
 # Activer l'auto complétion de bash pour les outils de nutools
 #export UTOOLS_BASH_COMPLETION=1
+#export UTOOLS_BASH_COMPLETION_COMPAT=bash41
 
 # utools utilise su plutôt que sudo pour la fonction run_as_root et le script
 # _root. Par défaut, ce n'est le cas que si sudo n'est pas installé. Si sudo est