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"