]> git.madduck.net Git - etc/zsh.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Rename logging functions
authormartin f. krafft <madduck@madduck.net>
Wed, 15 Mar 2017 23:08:07 +0000 (12:08 +1300)
committermartin f. krafft <madduck@madduck.net>
Wed, 15 Mar 2017 23:08:07 +0000 (12:08 +1300)
.zsh/logging
.zsh/sourcedir

index ad4c54ae52365a951d9d89dd1ac40d52e2012bc9..26d7544ccc0cd5207bee526d2abf374a907f830b 100644 (file)
@@ -15,24 +15,24 @@ __log() {
 __do_debug() {
   [ -n "${ZDEBUG:-}" ]
 }
 __do_debug() {
   [ -n "${ZDEBUG:-}" ]
 }
-error() {
+zerror() {
   [[ -o xtrace ]] && set +x && local __XTRACE=1
   [[ -o xtrace ]] && set +x && local __XTRACE=1
-  __log E "$@" 
+  __log E "$@"
   [ "${__XTRACE:-}" ] && set -x
 }
   [ "${__XTRACE:-}" ] && set -x
 }
-warn() {
+zwarn() {
   [[ -o xtrace ]] && set +x && local __XTRACE=1
   [[ -o xtrace ]] && set +x && local __XTRACE=1
-  __log W "$@" 
+  __log W "$@"
   [ "${__XTRACE:-}" ] && set -x
 }
   [ "${__XTRACE:-}" ] && set -x
 }
-info() {
+zinfo() {
   [[ -o xtrace ]] && set +x && local __XTRACE=1
   [[ -o xtrace ]] && set +x && local __XTRACE=1
-  __log I "$@" 
+  __log I "$@"
   [ "${__XTRACE:-}" ] && set -x
 }
   [ "${__XTRACE:-}" ] && set -x
 }
-debug() {
+zdebug() {
   [[ -o xtrace ]] && set +x && local __XTRACE=1
   [[ -o xtrace ]] && set +x && local __XTRACE=1
-  __do_debug && __log D "$@" 
+  __do_debug && __log D "$@"
   [ "${__XTRACE:-}" ] && set -x
 }
 
   [ "${__XTRACE:-}" ] && set -x
 }
 
index 40f1aa0b0acc1f402aef610810e901a355f79d5a..42269152016e3dd0b4f172ac7855b799f58b3133 100644 (file)
 
 sourcedir() {
   if [ ! -d "$1" ]; then
 
 sourcedir() {
   if [ ! -d "$1" ]; then
-    error "no such directory: $1"
+    zerror "no such directory: $1"
     return 1
   fi
     return 1
   fi
-#  debug "sourcing directory ${1#$ZDOTDIR/}"
+#  zdebug "sourcing directory ${1#$ZDOTDIR/}"
   for f in "$1"/*(.N,@N); do
     case "$f" in
       *~|*.bak|*.old|*.sw?|*.zwc|*.disabled) continue;;
     esac
   for f in "$1"/*(.N,@N); do
     case "$f" in
       *~|*.bak|*.old|*.sw?|*.zwc|*.disabled) continue;;
     esac
-#    debug "  sourcing file $f"
+#    zdebug "  sourcing file $f"
     source "$f"
   done
 }
     source "$f"
   done
 }