diff --git a/.gitignore b/.gitignore index 1bb77a3..183552f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ sub/vim/bundle sub/zsh/plugins sub/bash/bashrc.d/* !sub/bash/bashrc.d/00_test.sh +sub/zsh/zshrc.d/* +!sub/zsh/shrc.d/00_test.sh diff --git a/sub/bash/functions b/sub/bash/functions index 01adb95..64952e6 100644 --- a/sub/bash/functions +++ b/sub/bash/functions @@ -1,4 +1,12 @@ +_sod () { + if [ -d "$1" ] && [ -n "$(ls "$1"/ 2>/dev/null)" ]; then + for FILENAME in $(ls "$1"/ | sort -n) + do + source "$1"/"$FILENAME" + done + fi +} destroy() { test -n "$1" || return 1 diff --git a/sub/bash/sourcer b/sub/bash/sourcer index c1f717b..64b9a11 100644 --- a/sub/bash/sourcer +++ b/sub/bash/sourcer @@ -1,24 +1,19 @@ -so () { +_so () { [ -f "$1" ] && source "$1" } if [[ $0 == *bash ]]; then - so "$HOME"/.subbash/export - so "$HOME"/.subbash/shopt + _so "$HOME"/.subbash/export + _so "$HOME"/.subbash/shopt fi if [[ $- == *i* ]]; then - so "$HOME"/.subbash/prompt - so "$HOME"/.subbash/aliases - so "$HOME"/.subbash/functions - so "$HOME"/.subbash/completion + _so "$HOME"/.subbash/prompt + _so "$HOME"/.subbash/aliases + _so "$HOME"/.subbash/functions + _so "$HOME"/.subbash/completion fi -if [ -d "$HOME"/.subbash/bashrc.d ] && [ -n "$(ls "$HOME"/.subbash/bashrc.d/ 2>/dev/null)" ]; then - for FILENAME in $(ls "$HOME"/.subbash/bashrc.d/ | sort -n) - do - source "$HOME"/.subbash/bashrc.d/"$FILENAME" - done -fi +_sod "$HOME"/.subbash/bashrc.d diff --git a/sub/zsh/sourcer b/sub/zsh/sourcer index c4c9cef..cf2fab9 100644 --- a/sub/zsh/sourcer +++ b/sub/zsh/sourcer @@ -1,26 +1,21 @@ -so () { + +_so () { [ -f "$1" ] && source "$1" } +_so /etc/zsh_command_not_found +_so "$HOME"/.subzsh/options +_so "$HOME"/.subzsh/completion +_so "$HOME"/.subzsh/history +_so "$HOME"/.subzsh/prompt +_so "$HOME"/.subzsh/other +_so "$HOME"/.subzsh/plugin +_so "$HOME"/.subzsh/aliases -so /etc/zsh_command_not_found -so "$HOME"/.subzsh/options -so "$HOME"/.subzsh/completion -so "$HOME"/.subzsh/history -so "$HOME"/.subzsh/prompt -so "$HOME"/.subzsh/other -so "$HOME"/.subzsh/plugin -so "$HOME"/.subzsh/aliases - -so "$HOME"/.subbash/aliases -so "$HOME"/.subbash/completion -so "$HOME"/.subbash/export -so "$HOME"/.subbash/functions -so "$HOME"/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh +_so "$HOME"/.subbash/aliases +_so "$HOME"/.subbash/completion +_so "$HOME"/.subbash/export +_so "$HOME"/.subbash/functions +_so "$HOME"/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh -if [ -d "$HOME"/.subbash/bashrc.d ] && [ -n "$(ls "$HOME"/.subbash/bashrc.d/ 2>/dev/null)" ]; then - for FILENAME in $(ls "$HOME"/.subbash/bashrc.d/ | sort -n) - do - source "$HOME"/.subbash/bashrc.d/"$FILENAME" - done -fi +_sod "$HOME"/.subzsh/zshrc.d