Grand Ménage.... (pff j'oublie tt le temps des trucs..)

git-svn-id: svn+ssh://hugues@maison/opt/svn/private/hugues@256 a0e5b806-a6f9-0310-978d-cbce73f8a913

1 files changed, 29 insertions, 24 deletions

diff --git a/.zshrc b/.zshrc
index 64503a3..b2639a9 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,34 +1,40 @@
-
-ZDOTDIR=~/.zsh
-
 ##
 ## THIS FILE IS NOT INTENDED TO BE MODIFIED ! READ ABOVE...
 ##
-## Instead, add/edit your configuration files inside $ZDOTDIR.
-##
-## If you want to add a file, name it specifically in the form
-##
-## 	$ZDOTDIR/??_*.zsh
-##
-## Where "??" should be a two-digits number.
-## With that, file ``10_Toto.zsh'' would be parsed before
-## file ``20_Tutu.zsh'', allowing you to organize your scripts.
-## 
-## If you want to make host-specific configurations, create a
-## file named with the root of your configuration file, and
-## append to it ".$(hostname -s)". (replace "zsh" by the hostname.
-## if you have a computer named "zsh", well....... :-) )
-## For example, for specific configuration for the host HAL in
-## the file 10_Toto.zsh, you would create a file named 10_Toto.HAL
-##
+#
+# Instead, add/edit your configuration files inside $ZDOTDIR.
+#
+# If you want to add a file, name it specifically in the form
+#
+# 	$ZDOTDIR/??_*.zsh
+#
+# Where "??" should be a two-digit number.
+# With that, file ``10_Toto.zsh'' would be parsed before
+# file ``20_Tutu.zsh'', allowing you ordering your scripts.
+# 
+# If you want to make host-specific configurations, create a
+# file named with the root of your configuration file, and
+# append to it ".$(hostname -s)". (replace "zsh" by the hostname.
+# if you have a computer named "zsh", well....... :-) )
+# For example, for specific configuration for the host HAL in
+# the file 10_Toto.zsh, you would create a file named 10_Toto.HAL
+#
+
+ZDOTDIR=${ZDOTDIR:-~/.zsh}
+mkdir -p $ZDOTDIR
 
 if [ -d $ZDOTDIR ]; then
 	for script in $ZDOTDIR/??_*.zsh
 	do
+
+        [ "$DEBUG" != "" ] && echo "${${script:t:r}/??_/}... ";
 		source $script
-		# find host-based script and source it
-		local_script="${script:r}.`hostname -s`"
-		[ -f $local_script ] && source $local_script
+
+        for i in "host:`hostname -s`" "user:`whoami`" #"host:`hostname -s`.user:`whoami`"
+        do
+            specific_script=${script:h}/$i/${script:t}
+            [ -f $specific_script ] && source $specific_script
+        done
 	done
 fi
 
@@ -36,6 +42,5 @@ if [ "`whoami`" = "root" ]
 then
 	[ "`pwd`" = ~ ] && cd ~root
 	export HOME=~root
-	HISTFILE=$HISTFILE.root
 fi