From 79f21e0c29b45930706516d72fa273786153b11a Mon Sep 17 00:00:00 2001
From: hugues <hugues@a0e5b806-a6f9-0310-978d-cbce73f8a913>
Date: Tue, 4 Apr 2006 20:23:33 +0000
Subject: Mises à jour diverses : sudo, keychain
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn+ssh://hugues@maison/opt/svn/private/hugues@223 a0e5b806-a6f9-0310-978d-cbce73f8a913
---
 .keychain           |  2 +-
 .zlogin             |  6 +++---
 .zshrc              | 13 +++----------
 01_Aliases.prunelle |  1 -
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/.keychain b/.keychain
index 92bd52c..21f145f 100644
--- a/.keychain
+++ b/.keychain
@@ -1,3 +1,3 @@
 KEYCHAIN=~/.keychain/$(hostname)-sh
-[ -f $KEYCHAIN ] && source $KEYCHAIN
+[ -f ${KEYCHAIN}     ] && source ${KEYCHAIN}
 [ -f ${KEYCHAIN}-gpg ] && source ${KEYCHAIN}-gpg
diff --git a/.zlogin b/.zlogin
index 20682bb..cf26019 100644
--- a/.zlogin
+++ b/.zlogin
@@ -8,6 +8,6 @@ for i in {1..$COLUMNS} ; do echo -n "_" ; done
 echo ""
 
 source $ZDOTDIR/.keychain
-
-keychain --inherit any --quiet --quick id_dsa
-keychain --inherit any --quiet --quick 593F1F92
+keychain --quiet --stop others --inherit any
+keychain --quiet --quick id_dsa
+keychain --quiet --quick 593F1F92
diff --git a/.zshrc b/.zshrc
index 3868a76..936dfc3 100644
--- a/.zshrc
+++ b/.zshrc
@@ -5,21 +5,14 @@ if [ -d $ZDOTDIR ]; then
 	do
 		source $script
 		local_script="${script:r}.`hostname -s`"
-
-		if ( [ -f $local_script ] )
-		then
-			source $local_script
-		fi
+		[ -f $local_script ] && source $local_script
 	done
 fi
 
 if [ "`whoami`" = "root" ]
 then
-	if [ "`pwd`" = ~ ]
-	then
-		cd ~root
-	fi
+	[ "`pwd`" = ~ ] && cd ~root
 	export HOME=~root
+	HISTFILE=$HISTFILE.root
 fi
-#cd ~
 
diff --git a/01_Aliases.prunelle b/01_Aliases.prunelle
index 7d71cf3..b2c0bc2 100644
--- a/01_Aliases.prunelle
+++ b/01_Aliases.prunelle
@@ -1,4 +1,3 @@
-a emacs='emacs21'
 a port='sudo port'
 a ls='ls -FG'
 a aless='open -a /Applications/DarwinPorts/AquaLess.app'
-- 
cgit v1.2.3