From e3f76cdcbc1c15c4f9497dec426cf498ce261720 Mon Sep 17 00:00:00 2001
From: Jephte Clain <Jephte.Clain@univ-reunion.fr>
Date: Mon, 22 Jun 2015 01:25:27 +0400
Subject: [PATCH] =?UTF-8?q?possibilit=C3=A9=20de=20sp=C3=A9cifier=20si=20u?=
 =?UTF-8?q?n=20profil=20doit=20=C3=AAtre=20install=C3=A9=20dans=20le=20r?=
 =?UTF-8?q?=C3=A9pertoire=20de=20profil=20partag=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .udir                                         |  2 +-
 ...bash_completion => bash_completion.shared} |  0
 ...r_ls.[Darwin] => color_ls.[Darwin].shared} |  0
 ...lor_ls.[Linux] => color_ls.[Linux].shared} |  0
 ...lor_ls.[SunOS] => color_ls.[SunOS].shared} |  0
 ...nfirm_rm,mv,cp => confirm_rm,mv,cp.shared} |  0
 .../{ls_options => ls_options.shared}         |  0
 .../{bash_prompt => bash_prompt.shared}       |  0
 .../{bin_in_path => bin_in_path.shared}       |  0
 lib/profile.d/{dbus => dbus.shared}           |  0
 .../{histcontrol => histcontrol.shared}       |  0
 ...win] => local_bin_in_path.[Darwin].shared} |  0
 lib/profile.d/{nutools => nutools.shared}     |  0
 lib/profile.d/{proxy => proxy.shared}         |  0
 .../{webobjects => webobjects.shared}         |  0
 lib/ulib/uenv_update                          | 26 +++++++++++++------
 16 files changed, 19 insertions(+), 9 deletions(-)
 rename lib/bashrc.d/{bash_completion => bash_completion.shared} (100%)
 rename lib/bashrc.d/{color_ls.[Darwin] => color_ls.[Darwin].shared} (100%)
 rename lib/bashrc.d/{color_ls.[Linux] => color_ls.[Linux].shared} (100%)
 rename lib/bashrc.d/{color_ls.[SunOS] => color_ls.[SunOS].shared} (100%)
 rename lib/bashrc.d/{confirm_rm,mv,cp => confirm_rm,mv,cp.shared} (100%)
 rename lib/bashrc.d/{ls_options => ls_options.shared} (100%)
 rename lib/profile.d/{bash_prompt => bash_prompt.shared} (100%)
 rename lib/profile.d/{bin_in_path => bin_in_path.shared} (100%)
 rename lib/profile.d/{dbus => dbus.shared} (100%)
 rename lib/profile.d/{histcontrol => histcontrol.shared} (100%)
 rename lib/profile.d/{local_bin_in_path.[Darwin] => local_bin_in_path.[Darwin].shared} (100%)
 rename lib/profile.d/{nutools => nutools.shared} (100%)
 rename lib/profile.d/{proxy => proxy.shared} (100%)
 rename lib/profile.d/{webobjects => webobjects.shared} (100%)

diff --git a/.udir b/.udir
index b8ace89..c816bf3 100644
--- a/.udir
+++ b/.udir
@@ -18,7 +18,7 @@ kvm_service=
 openvz_service=
 
 configure_variables=(dest uninst_utools rm_utools kvm_service openvz_service)
-configure_dest_for=(bashrc profile lib/uinst/conf lib/uinst/rootconf lib/profile.d/nutools lib/bashrc.d/bash_completion lib/init.d/kvm-stop-all legacy/sysinc/utools legacy/sysinc/system_caps legacy/sysinc/private/init)
+configure_dest_for=(bashrc profile lib/uinst/conf lib/uinst/rootconf lib/profile.d/nutools.shared lib/bashrc.d/bash_completion.shared lib/init.d/kvm-stop-all legacy/sysinc/utools legacy/sysinc/system_caps legacy/sysinc/private/init)
 config_scripts=(lib/uinst/conf lib/uinst/system_caps.legacy)
 install_profiles=true
 profiledir=lib/profile.d
diff --git a/lib/bashrc.d/bash_completion b/lib/bashrc.d/bash_completion.shared
similarity index 100%
rename from lib/bashrc.d/bash_completion
rename to lib/bashrc.d/bash_completion.shared
diff --git a/lib/bashrc.d/color_ls.[Darwin] b/lib/bashrc.d/color_ls.[Darwin].shared
similarity index 100%
rename from lib/bashrc.d/color_ls.[Darwin]
rename to lib/bashrc.d/color_ls.[Darwin].shared
diff --git a/lib/bashrc.d/color_ls.[Linux] b/lib/bashrc.d/color_ls.[Linux].shared
similarity index 100%
rename from lib/bashrc.d/color_ls.[Linux]
rename to lib/bashrc.d/color_ls.[Linux].shared
diff --git a/lib/bashrc.d/color_ls.[SunOS] b/lib/bashrc.d/color_ls.[SunOS].shared
similarity index 100%
rename from lib/bashrc.d/color_ls.[SunOS]
rename to lib/bashrc.d/color_ls.[SunOS].shared
diff --git a/lib/bashrc.d/confirm_rm,mv,cp b/lib/bashrc.d/confirm_rm,mv,cp.shared
similarity index 100%
rename from lib/bashrc.d/confirm_rm,mv,cp
rename to lib/bashrc.d/confirm_rm,mv,cp.shared
diff --git a/lib/bashrc.d/ls_options b/lib/bashrc.d/ls_options.shared
similarity index 100%
rename from lib/bashrc.d/ls_options
rename to lib/bashrc.d/ls_options.shared
diff --git a/lib/profile.d/bash_prompt b/lib/profile.d/bash_prompt.shared
similarity index 100%
rename from lib/profile.d/bash_prompt
rename to lib/profile.d/bash_prompt.shared
diff --git a/lib/profile.d/bin_in_path b/lib/profile.d/bin_in_path.shared
similarity index 100%
rename from lib/profile.d/bin_in_path
rename to lib/profile.d/bin_in_path.shared
diff --git a/lib/profile.d/dbus b/lib/profile.d/dbus.shared
similarity index 100%
rename from lib/profile.d/dbus
rename to lib/profile.d/dbus.shared
diff --git a/lib/profile.d/histcontrol b/lib/profile.d/histcontrol.shared
similarity index 100%
rename from lib/profile.d/histcontrol
rename to lib/profile.d/histcontrol.shared
diff --git a/lib/profile.d/local_bin_in_path.[Darwin] b/lib/profile.d/local_bin_in_path.[Darwin].shared
similarity index 100%
rename from lib/profile.d/local_bin_in_path.[Darwin]
rename to lib/profile.d/local_bin_in_path.[Darwin].shared
diff --git a/lib/profile.d/nutools b/lib/profile.d/nutools.shared
similarity index 100%
rename from lib/profile.d/nutools
rename to lib/profile.d/nutools.shared
diff --git a/lib/profile.d/proxy b/lib/profile.d/proxy.shared
similarity index 100%
rename from lib/profile.d/proxy
rename to lib/profile.d/proxy.shared
diff --git a/lib/profile.d/webobjects b/lib/profile.d/webobjects.shared
similarity index 100%
rename from lib/profile.d/webobjects
rename to lib/profile.d/webobjects.shared
diff --git a/lib/ulib/uenv_update b/lib/ulib/uenv_update
index 83767fc..c3f6194 100644
--- a/lib/ulib/uenv_update
+++ b/lib/ulib/uenv_update
@@ -224,7 +224,8 @@ cas, il faut décommenter la ligne dans ~/.bash_profile qui source ~/.profile"
 function uenv_install_profiles() {
     local projdir="$1" profiledir="$2" bashrcdir="$3" defaultdir="$4"
     local tmpfile
-    local prefix envsrcdir envdestdir envfiles envfile envsrc envdest
+    local prefix envsrcdir envdestdir shadestdir envfiles envfile envsrc envdest shadest
+    local shared_profiledestdir shared_bashrcdestdir shared_defaultdestdir
     local profiledestdir bashrcdestdir defaultdestdir
     uenv_set_destdirs
     
@@ -237,16 +238,25 @@ function uenv_install_profiles() {
 
         array_from_lines envfiles "$(list_files "$envsrcdir")"
         for envfile in "${envfiles[@]}"; do
-            envsrc="$envsrcdir/$envfile"
-            envdest="$envdestdir/$envfile"
-            shadest="$shadestdir/$envfile"
-            
             mkdir -p "$envdestdir" "$shadestdir"
-            if [ ! -f "$envdest" -a -f "$shadest" ]; then
-                # Si déjà installé en partagé, continuer à mettre à jour ce
-                # fichier-là
+            if [ "${envfile%.shared}" != "$envfile" ]; then
+                # Avec l'extension .shared, toujours installer dans le
+                # répertoire des profils partagés
+                envsrc="$envsrcdir/$envfile"
+                envfile="${envfile%.shared}"
+                shadest="$shadestdir/$envfile"
                 envdest="$shadest"
+            else
+                envsrc="$envsrcdir/$envfile"
+                envdest="$envdestdir/$envfile"
+                shadest="$shadestdir/$envfile"
+                if [ ! -f "$envdest" -a -f "$shadest" ]; then
+                    # Si déjà installé en partagé, continuer à mettre à jour ce
+                    # fichier-là
+                    envdest="$shadest"
+                fi
             fi
+
             if [ ! -f "$envdest" ]; then
                 estep "Installation du profil par défaut $envfile dans $(ppath "$envdestdir")"
                 /bin/cp -f "$envsrc" "$envdestdir"