Merge 84e0787411 into 6e564503f1

Remove redundant quotes from comparisons and
variable expansions where they are not needed.

Also add style nits to comments and code.

init.zsh

@@ -173,7 +173,7 @@ if [[ -s "${ZDOTDIR:-$HOME}/.zpreztorc" ]]; then
 fi
 
 # Disable color and theme in dumb terminals.
-if [[ "$TERM" == 'dumb' ]]; then
+if [[ $TERM == dumb ]]; then
   zstyle ':prezto:*:*' color 'no'
   zstyle ':prezto:module:prompt' theme 'off'
 fi

modules/archive/functions/archive

@@ -10,7 +10,7 @@
 local archive_name path_to_archive _gzip_bin _bzip2_bin _xz_bin _zstd_bin
 
 if (( $# < 2 )); then
-  cat >&2 <<EOF
+  >&2 <<EOF
 usage: $0 [archive_name.zip] [/path/to/include/into/archive ...]
 
 Where 'archive.zip' uses any of the following extensions:

modules/archive/functions/lsarchive

@@ -10,7 +10,7 @@
 local verbose
 
 if (( $# == 0 )); then
-  cat >&2 <<EOF
+  >&2 <<EOF
 usage: $0 [-option] [file ...]
 
 options:

modules/archive/functions/unarchive

@@ -15,7 +15,7 @@ local extract_dir
 local _gzip_bin _bzip2_bin _xz_bin _zstd_bin
 
 if (( $# == 0 )); then
-  cat >&2 <<EOF
+  >&2 <<EOF
 usage: $0 [-option] [file ...]
 
 options:

modules/completion/init.zsh

@@ -7,7 +7,7 @@
 #
 
 # Return if requirements are not found.
-if [[ $TERM == 'dumb' ]]; then
+if [[ $TERM == dumb ]]; then
   return 1
 fi
 

modules/dpkg/functions/deb-history

@@ -26,7 +26,7 @@ case "$1" in
     zcat $(ls -rt /var/log/dpkg*)
   ;;
   (*)
-    cat >&2 <<EOF
+    >&2 <<EOF
 Commands:
     install - List installed packages
     upgrade - List upgraded packages

modules/environment/init.zsh

@@ -14,7 +14,7 @@
 # paste had a regression. Additionally, 5.2 added bracketed-paste-url-magic
 # which is generally better than url-quote-magic so we load that when possible.
 autoload -Uz is-at-least
-if [[ ${ZSH_VERSION} != 5.1.1 && ${TERM} != "dumb" ]]; then
+if [[ $ZSH_VERSION != 5.1.1 && $TERM != dumb ]]; then
   if is-at-least 5.2; then
     autoload -Uz bracketed-paste-url-magic
     zle -N bracketed-paste bracketed-paste-url-magic
@@ -34,7 +34,8 @@ setopt COMBINING_CHARS      # Combine zero-length punctuation characters (accent
                             # with the base character.
 setopt INTERACTIVE_COMMENTS # Enable comments in interactive shell.
 setopt RC_QUOTES            # Allow 'Henry''s Garage' instead of 'Henry'\''s Garage'.
-unsetopt MAIL_WARNING       # Don't print a warning message if a mail file has been accessed.
+unsetopt MAIL_WARNING       # Don't print a warning message if a mail file has
+                            # been accessed.
 
 # Allow mapping Ctrl+S and Ctrl+Q shortcuts
 [[ -r ${TTY:-} && -w ${TTY:-} && $+commands[stty] == 1 ]] && stty -ixon <$TTY >$TTY

modules/spectrum/init.zsh

@@ -7,7 +7,7 @@
 #
 
 # Return if requirements are not found.
-if [[ "$TERM" == 'dumb' ]]; then
+if [[ $TERM == dumb ]]; then
   return 1
 fi
 

modules/terminal/init.zsh

@@ -7,7 +7,7 @@
 #
 
 # Return if requirements are not found.
-if [[ "$TERM" == (dumb|linux|*bsd*|eterm*) ]]; then
+if [[ $TERM == (dumb|linux|*bsd*|eterm*) ]]; then
   return 1
 fi
 
@@ -60,7 +60,7 @@ function _terminal-set-titles-with-command {
     local truncated_cmd="${cmd/(#m)?(#c15,)/${MATCH[1,12]}...}"
     unset MATCH
 
-    if [[ "$TERM" == screen* ]]; then
+    if [[ $TERM == screen* ]]; then
       set-multiplexer-title "$truncated_cmd"
     fi
     set-tab-title "$truncated_cmd"
@@ -78,7 +78,7 @@ function _terminal-set-titles-with-path {
   local truncated_path="${abbreviated_path/(#m)?(#c15,)/...${MATCH[-12,-1]}}"
   unset MATCH
 
-  if [[ "$TERM" == screen* ]]; then
+  if [[ $TERM == screen* ]]; then
     set-multiplexer-title "$truncated_path"
   fi
   set-tab-title "$truncated_path"
@@ -89,7 +89,7 @@ function _terminal-set-titles-with-path {
 autoload -Uz add-zsh-hook
 
 # Set up the Apple Terminal.
-if [[ "$TERM_PROGRAM" == 'Apple_Terminal' ]] \
+if [[ $TERM_PROGRAM == Apple_Terminal ]] \
   && ( ! [[ -n "$STY" || -n "$TMUX" || -n "$DVTM" ]] )
 then
   # Sets the Terminal.app current working directory before the prompt is

modules/utility/functions/prep

@@ -9,8 +9,7 @@
 
 local usage pattern modifiers invert
 
-usage="$(
+usage="$(<<EOF
-cat <<EOF
 usage: $0 [-option ...] [--] pattern [file ...]
 
 options:

modules/utility/functions/psub

@@ -9,8 +9,7 @@
 
 local usage pattern replacement modifiers
 
-usage="$(
+usage="$(<<EOF
-cat <<EOF
 usage: $0 [-option ...] [--] pattern replacement [file ...]
 
 options:

modules/utility/functions/zsh-help

@@ -9,8 +9,7 @@
 
 # function zsh-help {
 
-local usage="$(
+local usage="$(<<EOF
-cat <<EOF
 usage: $0 [--help] [--zsh-help-debug] [--all] search term(s)
 Options:
     --all - search for the term anywhere, not just at the start of a line.

runcoms/zlogout

@@ -14,6 +14,6 @@ SAYINGS=(
 )
 
 # Print a randomly-chosen message:
-echo $SAYINGS[$(($RANDOM % ${#SAYINGS} + 1))]
+echo $SAYINGS[$(($RANDOM % $#SAYINGS + 1))]
 
 } >&2