lib/cli.zsh

@@ -391,9 +391,7 @@ function _omz::update {
 
   # Restart the zsh session
   if [[ $ret -eq 0 && "$1" != --unattended ]]; then
-    # Old zsh versions don't have ZSH_ARGZERO
-    local zsh="${ZSH_ARGZERO:-${functrace[-1]%:*}}"
     # Check whether to run a login shell
-    [[ "$zsh" = -* || -o login ]] && exec -l "${zsh#-}" || exec "$zsh"
+    [[ "$ZSH_ARGZERO" = -* ]] && exec -l "${ZSH_ARGZERO#-}" || exec "$ZSH_ARGZERO"
   fi
 }

plugins/grc/README.md

@@ -10,6 +10,28 @@ plugins=(... grc)
 
 ## Commands
 
-The plugin sources the bundled alias generator from the installation, available at `/etc/grc.zsh`.
-The complete list of wrapped commands may vary depending on the installed version of `grc`, look
-at the file mentioned above (`/etc/grc.zsh`) to see which commands are wrapped.
+The following commands are wrapped by `grc` so that their output is automatically colored:
+
+- `cc`
+- `configure`
+- `cvs`
+- `df`
+- `diff`
+- `dig`
+- `gcc`
+- `gmake`
+- `ifconfig`
+- `iwconfig`
+- `last`
+- `ldap`
+- `make`
+- `mount`
+- `mtr`
+- `netstat`
+- `ping`
+- `ping6`
+- `ps`
+- `traceroute`
+- `traceroute6`
+- `wdiff`
+- `whois`

plugins/grc/grc.plugin.zsh

@@ -1,17 +1,44 @@
-#!/usr/bin/env zsh
+# Adapted from: https://github.com/garabik/grc/blob/master/grc.zsh
 
-# common grc.zsh paths
-files=(
-  /etc/grc.zsh            # default
-  /usr/local/etc/grc.zsh  # homebrew
+if [[ "$TERM" = dumb ]] || (( ! $+commands[grc] )); then
+  return
+fi
+
+# Supported commands
+cmds=(
+  cc
+  configure
+  cvs
+  df
+  diff
+  dig
+  gcc
+  gmake
+  ifconfig
+  iwconfig
+  last
+  ldap
+  make
+  mount
+  mtr
+  netstat
+  ping
+  ping6
+  ps
+  traceroute
+  traceroute6
+  wdiff
+  whois
 )
 
-# verify the file is readable and source it
-for file in $files; do
-  if [[ -r "$file" ]]; then
-    source "$file"
-    break
+# Set alias for supported commands
+for cmd in $cmds; do
+  if (( $+commands[$cmd] )); then
+    eval "function $cmd {
+      grc --colour=auto \"${commands[$cmd]}\" \"\$@\"
+    }"
   fi
 done
 
-unset file files
+# Clean up variables
+unset cmds cmd