diff options
| -rw-r--r-- | .zlogin | 4 | ||||
| -rw-r--r-- | .zshrc | 7 | ||||
| -rw-r--r-- | 01_Functions.zsh | 2 | ||||
| -rw-r--r-- | 10_Environment.zsh | 2 |
4 files changed, 9 insertions, 6 deletions
@@ -2,9 +2,9 @@ [ -f $ZDOTDIR/user:`whoami`/zlogin ] && source $ZDOTDIR/user:`whoami`/zlogin [ -f $ZDOTDIR/.keychain ] && source $ZDOTDIR/.keychain -which keychain >/dev/null 2>&1 && keychain --quiet --stop others --inherit any +cmd_exists keychain && keychain --quiet --stop others --inherit any #keychain --quiet --quick id_dsa #keychain --quiet --quick 593F1F92 -which remind >/dev/null 2>&1 && remind -n +cmd_exists remind && remind -n @@ -31,13 +31,15 @@ UID=${UID:-`id -u`} HOST=${HOST:-$(hostname -s)} DOMAIN=${DOMAIN:-${$(hostname -d):-$(hostname -y)}} +DEBUG=no + export USER HOST DOMAIN UID if [ -d $ZDOTDIR ]; then for script in $ZDOTDIR/??_*.zsh do - [ "$DEBUG" != "" ] && echo "${${script:t:r}/??_/}... "; + [ "$DEBUG" = "yes" ] && echo "${${script:t:r}/??_/}... "; source $script for i in "net:$DOMAIN" "host:$HOST" "user:$USER" "user:$SUDO_USER" @@ -45,13 +47,14 @@ if [ -d $ZDOTDIR ]; then specific_script=${script:h}/$i/${${script:t}/??_/} if test -f $specific_script then + [ "$DEBUG" = "yes" ] && echo "$i/${${specific_script:t:r}/??_/}... "; source $specific_script fi done done fi -if [ "`whoami`" = "root" ] +if privileged_user then [ "`pwd`" = ~ ] && cd ~root export HOME=~root diff --git a/01_Functions.zsh b/01_Functions.zsh index 022a87d..9769e9a 100644 --- a/01_Functions.zsh +++ b/01_Functions.zsh @@ -49,7 +49,7 @@ cmd_exists () normal_user () { - eval `grep -v '^[$#]' /etc/login.defs | tr -d '[:blank:]' | sed 's/^[A-Z_]\+/&=/'` + eval `grep -v '^[$#]' /etc/login.defs | grep "^UID_" | tr -d '[:blank:]' | sed 's/^[A-Z_]\+/&=/'` test \( $UID -ge $UID_MIN \) -a \( $UID -le $UID_MAX \) } diff --git a/10_Environment.zsh b/10_Environment.zsh index 5360382..07fbaef 100644 --- a/10_Environment.zsh +++ b/10_Environment.zsh @@ -30,7 +30,7 @@ export PAGER=less ## Quelle commande utiliser par défaut ? export NULLCMD=cat -cmd_exists dircolors && eval $(dircolors ~/.dir_colors 2>&- ) +cmd_exists dircolors && eval $(dircolors ~/.dir_colors) export TZ="Europe/Paris" export TIME_STYLE="+%Y-%b-%d %H:%M:%S" |