From a716162821d4c88b1c1395b180a56811ca7d1848 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Thu, 11 Mar 2010 16:38:57 +0100 Subject: [PATCH] zsh/rc: Run commands after everything else is done. --- zsh/rc | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/zsh/rc b/zsh/rc index 487c4bc..9bbb283 100644 --- a/zsh/rc +++ b/zsh/rc @@ -452,25 +452,6 @@ tig() { } -# RUN COMMANDS - -# If not already in screen reattach to a running session or create a new one. -# -# screen* is necessary as `screen` uses screen.linux for example for a linux -# console which would otherwise cause an infinite loop. -if [[ $TERM != screen* && $TERM != 'dumb' ]]; then - # Get running detached sessions. - session=$(screen -list | grep 'Detached' | awk '{ print $1; exit }') - # Create a new session if none is running. - if [[ -z $session ]]; then - screen - # Reattach to a running session. - else - screen -r $session - fi -fi - - # OS SPECIFIC SETTINGS if [[ $(uname) == Linux ]]; then @@ -499,9 +480,31 @@ elif [[ $(uname) == Darwin ]]; then # Mac OS X fi +# LOAD ADDITIONAL CONFIGURATION FILES + # Load rc file for current hostname (first part before a dot) or rc.local. source_config ~/.zsh host rc ${$(hostname)//.*/} + +# RUN COMMANDS + +# If not already in screen reattach to a running session or create a new one. +# +# screen* is necessary as `screen` uses screen.linux for example for a linux +# console which would otherwise cause an infinite loop. +if [[ $TERM != screen* && $TERM != 'dumb' ]]; then + # Get running detached sessions. + session=$(screen -list | grep 'Detached' | awk '{ print $1; exit }') + # Create a new session if none is running. + if [[ -z $session ]]; then + screen + # Reattach to a running session. + else + screen -r $session + fi +fi + + source_debug "finished sourcing ~/.zsh/rc" # vim: ft=zsh -- 2.44.2