X-Git-Url: https://git.madduck.net/etc/zsh.git/blobdiff_plain/71a3a8fffb9b2544b5ec901045ed49b969f65dde..e45b0db3d66ca9e041622db3d801d026fb4d3724:/.zsh/sourcedir?ds=inline diff --git a/.zsh/sourcedir b/.zsh/sourcedir index ae7632a..cae9467 100644 --- a/.zsh/sourcedir +++ b/.zsh/sourcedir @@ -2,7 +2,7 @@ # # Defines helper function to source files in a directory # -# Copyright © 1994–2008 martin f. krafft +# Copyright © 1994–2017 martin f. krafft # Released under the terms of the Artistic Licence 2.0 # # Source repository: http://git.madduck.net/v/etc/zsh.git @@ -12,16 +12,19 @@ sourcedir() { if [ ! -d "$1" ]; then - error "no such directory: ${1#$ZDOTDIR/}" + zerror "no such directory: $1" return 1 fi - debug "sourcing directory ${1#$ZDOTDIR/}" - for f in "$1"/*(.N); do +# zdebug "sourcing directory ${1#$ZDOTDIR/}" + for f in "$1"/*(.N,@N); do case "$f" in - *~|*.bak|*.sw?|*.zwc|*.disabled) continue;; + *~|*.bak|*.old|*.sw?|*.zwc|*.disabled) continue;; + *-BREAK_HERE) + zinfo "Breaking out of sourcing file in '$1' due to file '${f##*/}'…" + break;; esac - debug " sourcing file $f" - . "$f" +# zdebug " sourcing file $f" + source "$f" done }