X-Git-Url: https://git.madduck.net/etc/zsh.git/blobdiff_plain/9a1960b5edade792e0d4d9a8c8e0630e774affc5..refs/heads/master:/.zsh/sourcedir?ds=sidebyside diff --git a/.zsh/sourcedir b/.zsh/sourcedir index 582f255..9b9803d 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,18 @@ 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"/*(.); 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) + break;; esac - debug " sourcing file $f" - . "$f" +# zdebug " sourcing file $f" + source "$f" done }