From ee0ed1a0b2a3044b655504d52396ab098af9f573 Mon Sep 17 00:00:00 2001 From: Loic Nageleisen Date: Mon, 13 Aug 2012 15:49:20 +0200 Subject: [PATCH 1/2] moving DOTFILES_* to a common place --- bash/profile | 5 ----- home/profile | 6 ++++++ zsh/profile | 5 ----- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/bash/profile b/bash/profile index c649c97..593eab8 100644 --- a/bash/profile +++ b/bash/profile @@ -1,10 +1,5 @@ ## bash_profile, called for login shells -# dotfiles locations -DOTFILES_HOME_DIR="$(cd -P "$(dirname "$(readlink ${BASH_SOURCE[0]})")" && pwd)" -DOTFILES_ROOT_DIR="$( dirname "$DOTFILES_HOME_DIR" )" -DOTFILES_BASH_DIR="$DOTFILES_ROOT_DIR/bash" - # include .profile source ~/.profile diff --git a/home/profile b/home/profile index 25bd478..d9399de 100644 --- a/home/profile +++ b/home/profile @@ -1,5 +1,11 @@ ## .profile +# dotfiles locations +DOTFILES_HOME_DIR="$(cd -P "$(dirname "$(readlink ~/.profile)")" && pwd)" +DOTFILES_ROOT_DIR="$( dirname "$DOTFILES_HOME_DIR" )" +DOTFILES_ZSH_DIR="$DOTFILES_ROOT_DIR/zsh" +DOTFILES_BASH_DIR="$DOTFILES_ROOT_DIR/bash" + # utility functions path_append () { diff --git a/zsh/profile b/zsh/profile index b656220..f91a374 100644 --- a/zsh/profile +++ b/zsh/profile @@ -1,10 +1,5 @@ # zprofile, called for login shells -# dotfiles locations -DOTFILES_HOME_DIR="$(cd -P "$(dirname "$(readlink ~/.zprofile)")" && pwd)" -DOTFILES_ROOT_DIR="$( dirname "$DOTFILES_HOME_DIR" )" -DOTFILES_ZSH_DIR="$DOTFILES_ROOT_DIR/zsh" - emulate sh source ~/.profile emulate zsh From 574058cf02bc1893ed89a0fb12bd56a21a41eab9 Mon Sep 17 00:00:00 2001 From: Loic Nageleisen Date: Mon, 13 Aug 2012 15:49:41 +0200 Subject: [PATCH 2/2] make bash check window size --- bash/rc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bash/rc b/bash/rc index 32cdc20..4d7cf10 100644 --- a/bash/rc +++ b/bash/rc @@ -5,11 +5,13 @@ source $DOTFILES_BASH_DIR/history source $DOTFILES_BASH_DIR/term_title source $DOTFILES_BASH_DIR/completion +# Make bash check its window size after a process completes +shopt -s checkwinsize + # easy on spelling mistakes shopt -s cdspell # turn off distractive bells set bell-style none - # vim: ft=sh