gnu-utility: Add more utility commands and rearrange

Add missing `basenc`, `egrep`, `fgrep` etc. and reformat a bit.

modules/gnu-utility/init.zsh

@@ -6,34 +6,36 @@
 #
 
 # Get the prefix or use the default.
-zstyle -s ':prezto:module:gnu-utility' prefix '_gnu_utility_p' || _gnu_utility_p='g'
+zstyle -s ':prezto:module:gnu-utility' prefix '_gnu_utility_p' \
+    || _gnu_utility_p='g'
 
 # Return if requirements are not found.
-if (( ! ${+commands[${_gnu_utility_p}whoami]} )); then
+if (( ! $+commands[${_gnu_utility_p}whoami] )); then
   return 1
 fi
 
 _gnu_utility_cmds=(
   # Coreutils
-  '[' 'b2sum' 'base32' 'base64' 'basename' 'cat' 'chcon' 'chgrp' 'chmod' 'chown'
-  'chroot' 'cksum' 'comm' 'cp' 'csplit' 'cut' 'date' 'dd' 'df'
-  'dir' 'dircolors' 'dirname' 'du' 'echo' 'env' 'expand' 'expr'
-  'factor' 'false' 'fmt' 'fold' 'groups' 'head' 'hostid' 'id'
-  'install' 'join' 'kill' 'link' 'ln' 'logname' 'ls' 'md5sum' 'mkdir'
-  'mkfifo' 'mknod' 'mktemp' 'mv' 'nice' 'nl' 'nohup' 'nproc'
-  'numfmt' 'od' 'paste' 'pathchk' 'pinky' 'pr' 'printenv' 'printf' 'ptx'
-  'pwd' 'readlink' 'realpath' 'rm' 'rmdir' 'runcon' 'seq' 'sha1sum'
-  'sha224sum' 'sha256sum' 'sha384sum' 'sha512sum' 'shred' 'shuf'
+  '[' 'b2sum' 'base32' 'base64' 'basename' 'basenc' 'cat' 'chcon' 'chgrp'
+  'chmod' 'chown' 'chroot' 'cksum' 'comm' 'cp' 'csplit' 'cut'
+  'date' 'dd' 'df' 'dir' 'dircolors' 'dirname' 'du' 'echo' 'env' 'expand' 'expr'
+  'factor' 'false' 'fmt' 'fold' 'groups' 'head' 'hostid' 'id' 'install' 'join'
+  'kill' 'link' 'ln' 'logname' 'ls' 'md5sum' 'mkdir' 'mkfifo'
+  'mknod' 'mktemp' 'mv' 'nice' 'nl' 'nohup' 'nproc' 'numfmt' 'od'
+  'paste' 'pathchk' 'pinky' 'pr' 'printenv' 'printf' 'ptx' 'pwd'
+  'readlink' 'realpath' 'rm' 'rmdir' 'runcon'
+  'seq' 'sha1sum' 'sha224sum' 'sha256sum' 'sha384sum' 'sha512sum' 'shred' 'shuf'
   'sleep' 'sort' 'split' 'stat' 'stdbuf' 'stty' 'sum' 'sync' 'tac' 'tail'
-  'tee' 'test' 'timeout' 'touch' 'tr' 'true' 'truncate' 'tsort'
-  'tty' 'uname' 'unexpand' 'uniq' 'unlink' 'uptime' 'users' 'vdir'
+  'tee' 'test' 'timeout' 'touch' 'tr' 'true' 'truncate' 'tsort' 'tty'
+  'uname' 'unexpand' 'uniq' 'unlink' 'uptime' 'users' 'vdir'
   'wc' 'who' 'whoami' 'yes'
 
   # The following utilities are not part of Coreutils but installed separately.
 
   # Binutils
-  'addr2line' 'ar' 'c++filt' 'elfedit' 'nm' 'objcopy' 'objdump'
-  'ranlib' 'readelf' 'size' 'strings' 'strip'
+  'addr2line' 'ar' 'c++filt' 'coffdump' 'dlltool' 'dllwrap' 'elfedit' 'nm'
+  'objcopy' 'objdump' 'ranlib' 'readelf'
+  'size' 'srconv' 'strings' 'strip' 'sysdump' 'windmc' 'windres'
 
   # Findutils
   'find' 'locate' 'oldfind' 'updatedb' 'xargs'
@@ -42,16 +44,18 @@ _gnu_utility_cmds=(
   'libtool' 'libtoolize'
 
   # Miscellaneous
-  'getopt' 'grep' 'indent' 'make' 'sed' 'tar' 'time' 'units' 'which'
+  'egrep' 'fgrep' 'getopt' 'grep' 'indent' 'make' 'sed' 'tar' 'time' 'units'
+  'which'
 )
 
 # Wrap GNU utilities in functions.
 for _gnu_utility_cmd in "${_gnu_utility_cmds[@]}"; do
   _gnu_utility_pcmd="${_gnu_utility_p}${_gnu_utility_cmd}"
-  if (( ${+commands[${_gnu_utility_pcmd}]} && ! ${+builtins[${_gnu_utility_cmd}]} )); then
+  if (( $+commands[$_gnu_utility_pcmd] \
+        && ! $+builtins[$_gnu_utility_cmd] )); then
     eval "
-      function ${_gnu_utility_cmd} {
-        '${commands[${_gnu_utility_pcmd}]}' \"\$@\"
+      function $_gnu_utility_cmd {
+        '$commands[$_gnu_utility_pcmd]' \"\$@\"
       }
     "
   fi