From 1eed679e4064af741d643e511f3a3e376d271ef4 Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Sat, 14 Nov 2015 14:18:06 +0100
Subject: [PATCH] Regle le prb avec dialogrc et l'env

---
 gestion/dialog/lc.py | 10 ++++------
 respbats/crans       |  9 +++------
 respbats/crans_lc    |  3 ---
 respbats/crans_old   |  6 ++++++
 4 files changed, 13 insertions(+), 15 deletions(-)
 delete mode 100755 respbats/crans_lc
 create mode 100755 respbats/crans_old

diff --git a/gestion/dialog/lc.py b/gestion/dialog/lc.py
index 22c9b886..c31b5081 100644
--- a/gestion/dialog/lc.py
+++ b/gestion/dialog/lc.py
@@ -28,17 +28,15 @@ from CPS import TailCall, tailcaller, Continue, TailCaller
 
 class Dialog(CPS.Dialog):
     def __init__(self, debug_enable=False, ldap_test=False, custom_user=None):
-    # if os.path.exists(os.path.expanduser('~/.dialogrc')):
-        if True:
-            dialogrc='~/.dialogrc'
-        else:
-            dialogrc=False
-        super(Dialog, self).__init__(debug_enable=debug_enable, dialogrc=dialogrc)
+        super(Dialog, self).__init__()
         # On initialise le moteur de rendu en spécifiant qu'on va faire du dialog
         printing.template(dialog=True)
         self.ldap_test = ldap_test
         self.custom_user = custom_user
         self.check_ldap()
+        login = self.conn.current_login
+        dialogrc='/home/%s/.dialogrc' % login
+        super(Dialog, self).__init__(debug_enable=debug_enable, dialogrc=dialogrc)
 
     def has_right(self, liste, obj=None):
         """Vérifie que l'un des droits de l'utilisateur courant est inclus dans list"""
diff --git a/respbats/crans b/respbats/crans
index d8f822b6..7813e92c 100755
--- a/respbats/crans
+++ b/respbats/crans
@@ -1,6 +1,3 @@
-#! /bin/bash
-# Si le script sort avec une erreur, on purge les locks deads
-LANG=fr_FR.UTF-8 sudo -u respbats /usr/scripts/gestion/gest_crans.py "$@"
-trucmuche=$?
-[ $trucmuche -eq 0 ] || LANG=fr_FR.UTF-8 sudo -u respbats /usr/scripts/gestion/ldap_crans.py --zombielock
-exit $(($trucmuche + $?))
+#!/bin/bash
+
+LANG=fr_FR.UTF-8 sudo -u respbats /usr/scripts/gestion/gest_crans_lc.py "$@"
diff --git a/respbats/crans_lc b/respbats/crans_lc
deleted file mode 100755
index 7813e92c..00000000
--- a/respbats/crans_lc
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-LANG=fr_FR.UTF-8 sudo -u respbats /usr/scripts/gestion/gest_crans_lc.py "$@"
diff --git a/respbats/crans_old b/respbats/crans_old
new file mode 100755
index 00000000..d8f822b6
--- /dev/null
+++ b/respbats/crans_old
@@ -0,0 +1,6 @@
+#! /bin/bash
+# Si le script sort avec une erreur, on purge les locks deads
+LANG=fr_FR.UTF-8 sudo -u respbats /usr/scripts/gestion/gest_crans.py "$@"
+trucmuche=$?
+[ $trucmuche -eq 0 ] || LANG=fr_FR.UTF-8 sudo -u respbats /usr/scripts/gestion/ldap_crans.py --zombielock
+exit $(($trucmuche + $?))