From 0ddc13eaeb020f5e6f935b86a26cafd699ac6bf4 Mon Sep 17 00:00:00 2001 From: Alexander Gehrke Date: Thu, 16 May 2013 13:14:41 +0200 Subject: [PATCH] Some minor fixes --- aliases/functions | 4 ++-- modules/color/init | 2 +- modules/work/init | 8 ++++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/aliases/functions b/aliases/functions index 730306b..6b6ba47 100644 --- a/aliases/functions +++ b/aliases/functions @@ -44,11 +44,11 @@ aliases() { # per directory configuration cd(){ if [ -e ".zout" ]; then - . ".zout" + . "./.zout" fi builtin cd $* if [ -e ".zin" ]; then - . ".zin" + . "./.zin" fi } diff --git a/modules/color/init b/modules/color/init index 14e1c16..b561a40 100644 --- a/modules/color/init +++ b/modules/color/init @@ -29,7 +29,7 @@ if [[ "`tput colors`" == "256" ]] || [[ "`tput colors`" == "88" ]] ; then usercolor_mod=28 fi - if [ ! -z $SSH_CLIENT ]; then + if [ ! -z $SSH_CLIENT ] || [ ! -z $SSH_CONNECTION ]; then usercolor_base=$((usercolor_base + usercolor_mod)) hostcolor="%{${FG[226]}%}" else diff --git a/modules/work/init b/modules/work/init index eddd502..e2a4cd6 100644 --- a/modules/work/init +++ b/modules/work/init @@ -1,5 +1,9 @@ #!/bin/zsh -if [ -n "$WTF_WORK_END" -a -e $HOME/.wtf ] && which wtf &>/dev/null; then - export WTF_REST=$(wtf raw -d $WTF_WORK_END diff); +if [ -e $HOME/.wtf ] && which wtf &>/dev/null; then + if [ -n "$WTF_WORK_END" ]; then + export WTF_REST=$(wtf raw -d $WTF_WORK_END diff); + else + export WTF_REST=$(wtf raw diff); + fi export WTF_REST_FORMATTED="$(printf "%.2f days\n" $((WTF_REST/28800.0)))" fi