From 7a92046c863c0b97cb06d843640b9015818f57e9 Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Thu, 13 Nov 2014 19:40:37 -0500
Subject: [PATCH 01/21] Create a new tmux session if none exists

---
 modules/tmux/init.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tmux/init.zsh b/modules/tmux/init.zsh
index ac944f60..778da81b 100644
--- a/modules/tmux/init.zsh
+++ b/modules/tmux/init.zsh
@@ -45,5 +45,5 @@ fi
 # Aliases
 #
 
-alias tmuxa="tmux $_tmux_iterm_integration attach-session"
+alias tmuxa="tmux $_tmux_iterm_integration new-session -A"
 alias tmuxl='tmux list-sessions'

From 3dd4cbc3c089c5e8cd7c09022ff94790e8da2fc0 Mon Sep 17 00:00:00 2001
From: Rys Sommefeldt <rys@pixeltards.com>
Date: Fri, 14 Nov 2014 20:12:21 +0000
Subject: [PATCH 02/21] Fix typo

Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
---
 modules/prompt/README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/prompt/README.md b/modules/prompt/README.md
index d72c6cf6..dc024977 100644
--- a/modules/prompt/README.md
+++ b/modules/prompt/README.md
@@ -46,7 +46,7 @@ The most basic example of this function can be seen below.
 If the `prompt_name_setup` function is customizable via parameters, a help
 function **should** be defined. The user will access it via `prompt -h name`.
 
-The most basic example of this function can be seen bellow.
+The most basic example of this function can be seen below.
 
     function prompt_name_help {
       cat <<EOH
@@ -63,7 +63,7 @@ The most basic example of this function can be seen bellow.
 If the `prompt_name_setup` function is customizable via parameters, a preview
 function **should** be defined. The user will access it via `prompt -p name`.
 
-The most basic example of this function can be seen bellow.
+The most basic example of this function can be seen below.
 
     function prompt_name_preview {
       if (( $# > 0 )); then
@@ -91,7 +91,7 @@ a function before you calling it.
 
 **Do not register hook functions. They will be registered by the `prompt` function.**
 
-The most basic example of this function can be seen bellow.
+The most basic example of this function can be seen below.
 
     function prompt_name_precmd {
       if (( $+functions[git-info] )); then

From 2a33581e80246aa584de0d1dfd0fc14ce6906007 Mon Sep 17 00:00:00 2001
From: Harry Terkelsen <harry.terkelsen@gmail.com>
Date: Fri, 14 Nov 2014 23:50:03 -0800
Subject: [PATCH 03/21] [Fix #724] Unquote variable

Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
---
 modules/tmux/init.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tmux/init.zsh b/modules/tmux/init.zsh
index 778da81b..070abcaf 100644
--- a/modules/tmux/init.zsh
+++ b/modules/tmux/init.zsh
@@ -38,7 +38,7 @@ if [[ -z "$TMUX" && -z "$EMACS" && -z "$VIM" ]] && ( \
   fi
 
   # Attach to the 'prezto' session or to the last session used.
-  exec tmux "$_tmux_iterm_integration" attach-session
+  exec tmux $_tmux_iterm_integration attach-session
 fi
 
 #

From 13d1ed160e8bbec02fea1cb5d73c7961db37c275 Mon Sep 17 00:00:00 2001
From: nfnty <git@nfnty.se>
Date: Sat, 22 Nov 2014 04:37:11 +0100
Subject: [PATCH 04/21] Use $GNUPGHOME if it exists

---
 modules/gpg/init.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gpg/init.zsh b/modules/gpg/init.zsh
index 0bb7476c..e644b3a2 100644
--- a/modules/gpg/init.zsh
+++ b/modules/gpg/init.zsh
@@ -11,7 +11,7 @@ if (( ! $+commands[gpg-agent] )); then
 fi
 
 # Set the default paths to gpg-agent files.
-_gpg_agent_conf="$HOME/.gnupg/gpg-agent.conf"
+_gpg_agent_conf="${GNUPGHOME:-$HOME/.gnupg}/gpg-agent.conf"
 _gpg_agent_env="${TMPDIR:-/tmp}/gpg-agent.env"
 
 # Start gpg-agent if not started.

From 9539341e1eddcdd08055e2c4993ba0f624fc8ea2 Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Mon, 24 Nov 2014 13:05:34 -0500
Subject: [PATCH 05/21] [Fix #732] Replace $GREP_OPTIONS with an alias

---
 modules/environment/init.zsh | 9 ---------
 modules/utility/init.zsh     | 6 ++++++
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/modules/environment/init.zsh b/modules/environment/init.zsh
index 51d26162..76655a6c 100644
--- a/modules/environment/init.zsh
+++ b/modules/environment/init.zsh
@@ -33,15 +33,6 @@ unsetopt BG_NICE          # Don't run all background jobs at a lower priority.
 unsetopt HUP              # Don't kill jobs on shell exit.
 unsetopt CHECK_JOBS       # Don't report on jobs when shell exit.
 
-#
-# Grep
-#
-
-if zstyle -t ':prezto:environment:grep' color; then
-  export GREP_COLOR='37;45'
-  export GREP_OPTIONS='--color=auto'
-fi
-
 #
 # Termcap
 #
diff --git a/modules/utility/init.zsh b/modules/utility/init.zsh
index 102ae5a1..c9ef94d1 100644
--- a/modules/utility/init.zsh
+++ b/modules/utility/init.zsh
@@ -102,6 +102,12 @@ alias lc='lt -c'         # Lists sorted by date, most recent last, shows change
 alias lu='lt -u'         # Lists sorted by date, most recent last, shows access time.
 alias sl='ls'            # I often screw this up.
 
+# Grep
+if zstyle -t ':prezto:module:utility:grep' color; then
+  export GREP_COLOR='37;45'
+  alias grep="$aliases[grep] --color=auto"
+fi
+
 # Mac OS X Everywhere
 if [[ "$OSTYPE" == darwin* ]]; then
   alias o='open'

From fc3f8025ea806a20aa0f7a2af9ef6f2be8b3b1a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20D=C3=A9trez?= <gregoire.detrez@gu.se>
Date: Thu, 27 Nov 2014 04:19:26 +0100
Subject: [PATCH 06/21] Add a preexec hook to set the GPG-Agent TTY

Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
---
 modules/gpg/init.zsh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/gpg/init.zsh b/modules/gpg/init.zsh
index e644b3a2..0ff42d19 100644
--- a/modules/gpg/init.zsh
+++ b/modules/gpg/init.zsh
@@ -35,6 +35,12 @@ if grep 'enable-ssh-support' "$_gpg_agent_conf" &> /dev/null; then
 
   # Load the SSH module for additional processing.
   pmodload 'ssh'
+
+  # Updates the GPG-Agent TTY before every command since SSH does not set it.
+  function _gpg-agent-update-tty {
+    gpg-connect-agent UPDATESTARTUPTTY /bye >/dev/null
+  }
+  add-zsh-hook preexec _gpg-agent-update-tty
 fi
 
 # Clean up.

From 0148ee6a4db42102b2fac871f9ee8b816866b695 Mon Sep 17 00:00:00 2001
From: Mathias Fussenegger <f.mathias@zignar.net>
Date: Thu, 27 Nov 2014 22:19:13 +0100
Subject: [PATCH 07/21] Check for S.gpg-agent to see if gpg-agent is running

From GnuPG changelog:

>  Removed the GPG_AGENT_INFO related code.  GnuPG does now
>  always use a fixed socket name in its home directory.

Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
---
 modules/gpg/init.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gpg/init.zsh b/modules/gpg/init.zsh
index 0ff42d19..1c3837d7 100644
--- a/modules/gpg/init.zsh
+++ b/modules/gpg/init.zsh
@@ -15,7 +15,7 @@ _gpg_agent_conf="${GNUPGHOME:-$HOME/.gnupg}/gpg-agent.conf"
 _gpg_agent_env="${TMPDIR:-/tmp}/gpg-agent.env"
 
 # Start gpg-agent if not started.
-if [[ -z "$GPG_AGENT_INFO" ]]; then
+if [[ -z "$GPG_AGENT_INFO" && ! -S "${GNUPGHOME:-$HOME/.gnupg}/S.gpg-agent" ]]; then
   # Export environment variables.
   source "$_gpg_agent_env" 2> /dev/null
 

From c171621747d12ac9a1660fb21e567a4c47ac2775 Mon Sep 17 00:00:00 2001
From: Ranek Kiil <ranek@users.noreply.github.com>
Date: Mon, 1 Dec 2014 23:28:02 -0700
Subject: [PATCH 08/21] Fix issue with several themes where errors occur if the
 git module is not loaded.

---
 modules/prompt/functions/prompt_cloud_setup    | 2 +-
 modules/prompt/functions/prompt_kylewest_setup | 2 +-
 modules/prompt/functions/prompt_skwp_setup     | 2 +-
 modules/prompt/functions/prompt_smiley_setup   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/prompt/functions/prompt_cloud_setup b/modules/prompt/functions/prompt_cloud_setup
index 0267c1e5..3b048df1 100644
--- a/modules/prompt/functions/prompt_cloud_setup
+++ b/modules/prompt/functions/prompt_cloud_setup
@@ -114,7 +114,7 @@ function prompt_cloud_setup {
     'rprompt' ''
 
   # Define prompts.
-  PROMPT='%B%F{$primary_color}${prefix}%f%b  %B%F{$secondary_color}%c%f%b $git_info[prompt] '
+  PROMPT='%B%F{$primary_color}${prefix}%f%b  %B%F{$secondary_color}%c%f%b ${git_info:+${(e)git_info[prompt]}} '
   RPROMPT=''
 }
 
diff --git a/modules/prompt/functions/prompt_kylewest_setup b/modules/prompt/functions/prompt_kylewest_setup
index 0c229a57..e4ee0c0e 100644
--- a/modules/prompt/functions/prompt_kylewest_setup
+++ b/modules/prompt/functions/prompt_kylewest_setup
@@ -58,7 +58,7 @@ function prompt_kylewest_setup {
   zstyle ':prezto:module:ruby:info:version' format '%F{blue}[%v]%f'
 
   # Define prompts.
-  PROMPT='%F{cyan}%c%f ${git_info[prompt]}${editor_info[keymap]} '
+  PROMPT='%F{cyan}%c%f ${git_info:+${(e)git_info[prompt]}}${editor_info[keymap]} '
   RPROMPT='${ruby_info[version]}'
 }
 
diff --git a/modules/prompt/functions/prompt_skwp_setup b/modules/prompt/functions/prompt_skwp_setup
index abe9e265..1c8f0a90 100644
--- a/modules/prompt/functions/prompt_skwp_setup
+++ b/modules/prompt/functions/prompt_skwp_setup
@@ -68,7 +68,7 @@ function prompt_skwp_setup {
   zstyle ':prezto:module:ruby:info:version' format '[%v]'
 
   # Define prompts.
-  PROMPT="${_prompt_skwp_colors[3]}%n%f@${_prompt_skwp_colors[2]}%m%f ${_prompt_skwp_colors[5]}%~%f "'$git_info[prompt]'"$ "
+  PROMPT="${_prompt_skwp_colors[3]}%n%f@${_prompt_skwp_colors[2]}%m%f ${_prompt_skwp_colors[5]}%~%f "'${git_info:+${(e)git_info[prompt]}}'"$ "
   RPROMPT='%F{blue}${ruby_info[version]}'
 }
 
diff --git a/modules/prompt/functions/prompt_smiley_setup b/modules/prompt/functions/prompt_smiley_setup
index 7679abe1..3066a2dc 100644
--- a/modules/prompt/functions/prompt_smiley_setup
+++ b/modules/prompt/functions/prompt_smiley_setup
@@ -57,7 +57,7 @@ function prompt_smiley_setup {
   zstyle ':prezto:module:git:info:keys' format 'prompt' '(%b%D)'
 
   # Define prompts.
-  PROMPT='$python_info[virtualenv]$ruby_info[version]${git_info[prompt]} %B%c%b %(?:%F{green}ツ%f:%F{red}✖%f) '
+  PROMPT='$python_info[virtualenv]$ruby_info[version]${git_info:+${(e)git_info[prompt]}} %B%c%b %(?:%F{green}ツ%f:%F{red}✖%f) '
   RPROMPT='${editor_info[overwrite]}${VIM:+" %B%F{green}V%f%b"}'
   SPROMPT='zsh: correct %F{red}%R%f to %F{green}%r%f [nyae]? '
 }

From 925b94b6e2565b3ad75d13acd9b345280120cf5f Mon Sep 17 00:00:00 2001
From: Jacob Swartwood <jswartwood@gmail.com>
Date: Wed, 3 Dec 2014 17:30:52 -0500
Subject: [PATCH 09/21] Fix Powerline unicode characters

Branch & separator characters are updated to display properly.
---
 modules/prompt/functions/prompt_paradox_setup | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/prompt/functions/prompt_paradox_setup b/modules/prompt/functions/prompt_paradox_setup
index f98377de..36ae40ec 100644
--- a/modules/prompt/functions/prompt_paradox_setup
+++ b/modules/prompt/functions/prompt_paradox_setup
@@ -18,7 +18,7 @@ pmodload 'helper'
 
 # Define variables.
 _prompt_paradox_current_bg='NONE'
-_prompt_paradox_segment_separator='⮀'
+_prompt_paradox_segment_separator=''
 _prompt_paradox_start_time=$SECONDS
 
 function prompt_paradox_start_segment {
@@ -129,7 +129,7 @@ function prompt_paradox_setup {
   zstyle ':prezto:module:git:info:added' format ' ✚'
   zstyle ':prezto:module:git:info:ahead' format ' ⬆'
   zstyle ':prezto:module:git:info:behind' format ' ⬇'
-  zstyle ':prezto:module:git:info:branch' format '⭠ %b'
+  zstyle ':prezto:module:git:info:branch' format ' %b'
   zstyle ':prezto:module:git:info:commit' format '➦ %.7c'
   zstyle ':prezto:module:git:info:deleted' format ' ✖'
   zstyle ':prezto:module:git:info:dirty' format ' ⁝'

From ba351df9fb03a7c9e73ff7922d7a5cd7c843804a Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Mon, 8 Dec 2014 18:13:25 -0500
Subject: [PATCH 10/21] [Fix #748] Set grep color for BSD and GNU

---
 modules/utility/init.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/utility/init.zsh b/modules/utility/init.zsh
index c9ef94d1..a32e5f39 100644
--- a/modules/utility/init.zsh
+++ b/modules/utility/init.zsh
@@ -104,7 +104,9 @@ alias sl='ls'            # I often screw this up.
 
 # Grep
 if zstyle -t ':prezto:module:utility:grep' color; then
-  export GREP_COLOR='37;45'
+  export GREP_COLOR='37;45'           # BSD.
+  export GREP_COLORS="mt=$GREP_COLOR" # GNU.
+
   alias grep="$aliases[grep] --color=auto"
 fi
 

From d43bcb972091878efa3692100e8479fb887332f5 Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Mon, 8 Dec 2014 18:21:00 -0500
Subject: [PATCH 11/21] Revert "Remove extra git-dir call in git-info and use
 git_dir variable instead"

This reverts commit 3012c0984b2b3fd97a58ac9dad1ae54efc546e49.
---
 modules/git/functions/git-info | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/git/functions/git-info b/modules/git/functions/git-info
index 200b2d25..8aaa4c32 100644
--- a/modules/git/functions/git-info
+++ b/modules/git/functions/git-info
@@ -198,7 +198,7 @@ function git-info {
 
   # Format stashed.
   zstyle -s ':prezto:module:git:info:stashed' format 'stashed_format'
-  if [[ -n "$stashed_format" && -f "${git_dir}/refs/stash" ]]; then
+  if [[ -n "$stashed_format" && -f "$(git-dir)/refs/stash" ]]; then
     stashed="$(git stash list 2> /dev/null | wc -l | awk '{print $1}')"
     if [[ -n "$stashed" ]]; then
       zformat -f stashed_formatted "$stashed_format" "S:$stashed"

From 62d87cae327ea2c4aa72fe2b3b56f5538d9b8cd5 Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Thu, 12 Feb 2015 19:15:47 -0500
Subject: [PATCH 12/21] Update external completions

---
 modules/completion/external | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/completion/external b/modules/completion/external
index 08afea0e..ed964013 160000
--- a/modules/completion/external
+++ b/modules/completion/external
@@ -1 +1 @@
-Subproject commit 08afea0e230b5a321d584119f55b675990327ef9
+Subproject commit ed964013e290677c866a055e1c1ece6f33f64151

From 4411c95a836e354dc333910182b015c08dc54d8b Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Thu, 12 Feb 2015 19:17:38 -0500
Subject: [PATCH 13/21] Update pure theme

---
 modules/prompt/external/pure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/prompt/external/pure b/modules/prompt/external/pure
index 2577a4cc..e5a55c54 160000
--- a/modules/prompt/external/pure
+++ b/modules/prompt/external/pure
@@ -1 +1 @@
-Subproject commit 2577a4cc078d05c51d9d8e4278b8d16ab348a1b9
+Subproject commit e5a55c5469b82da5bd9a9e42b144cef7cec8915b

From 88aee30ae8bc969e73c9c59b29e7866b2f7b1b5e Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Fri, 13 Feb 2015 00:00:27 -0500
Subject: [PATCH 14/21] [Fix #762] Use $LOGNAME instead of $USER

$USER is deprecated.
---
 modules/completion/init.zsh | 2 +-
 modules/gpg/init.zsh        | 2 +-
 modules/ssh/init.zsh        | 2 +-
 modules/utility/init.zsh    | 2 +-
 runcoms/zprofile            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/completion/init.zsh b/modules/completion/init.zsh
index 28c20905..9b5132c7 100644
--- a/modules/completion/init.zsh
+++ b/modules/completion/init.zsh
@@ -116,7 +116,7 @@ zstyle ':completion:*:(rm|kill|diff):*' ignore-line other
 zstyle ':completion:*:rm:*' file-patterns '*:all-files'
 
 # Kill
-zstyle ':completion:*:*:*:*:processes' command 'ps -u $USER -o pid,user,command -w'
+zstyle ':completion:*:*:*:*:processes' command 'ps -u $LOGNAME -o pid,user,command -w'
 zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;36=0=01'
 zstyle ':completion:*:*:kill:*' menu yes select
 zstyle ':completion:*:*:kill:*' force-list always
diff --git a/modules/gpg/init.zsh b/modules/gpg/init.zsh
index 1c3837d7..a7c6cf76 100644
--- a/modules/gpg/init.zsh
+++ b/modules/gpg/init.zsh
@@ -20,7 +20,7 @@ if [[ -z "$GPG_AGENT_INFO" && ! -S "${GNUPGHOME:-$HOME/.gnupg}/S.gpg-agent" ]];
   source "$_gpg_agent_env" 2> /dev/null
 
   # Start gpg-agent if not started.
-  if ! ps -U "$USER" -o pid,ucomm | grep -q -- "${${${(s.:.)GPG_AGENT_INFO}[2]}:--1} gpg-agent"; then
+  if ! ps -U "$LOGNAME" -o pid,ucomm | grep -q -- "${${${(s.:.)GPG_AGENT_INFO}[2]}:--1} gpg-agent"; then
     eval "$(gpg-agent --daemon | tee "$_gpg_agent_env")"
   fi
 fi
diff --git a/modules/ssh/init.zsh b/modules/ssh/init.zsh
index d8b59377..f632328d 100644
--- a/modules/ssh/init.zsh
+++ b/modules/ssh/init.zsh
@@ -25,7 +25,7 @@ if [[ ! -S "$SSH_AUTH_SOCK" ]]; then
   source "$_ssh_agent_env" 2> /dev/null
 
   # Start ssh-agent if not started.
-  if ! ps -U "$USER" -o pid,ucomm | grep -q -- "${SSH_AGENT_PID:--1} ssh-agent"; then
+  if ! ps -U "$LOGNAME" -o pid,ucomm | grep -q -- "${SSH_AGENT_PID:--1} ssh-agent"; then
     eval "$(ssh-agent | sed '/^echo /d' | tee "$_ssh_agent_env")"
   fi
 fi
diff --git a/modules/utility/init.zsh b/modules/utility/init.zsh
index a32e5f39..491af6ad 100644
--- a/modules/utility/init.zsh
+++ b/modules/utility/init.zsh
@@ -191,5 +191,5 @@ function find-exec {
 
 # Displays user owned processes status.
 function psu {
-  ps -U "${1:-$USER}" -o 'pid,%cpu,%mem,command' "${(@)argv[2,-1]}"
+  ps -U "${1:-$LOGNAME}" -o 'pid,%cpu,%mem,command' "${(@)argv[2,-1]}"
 }
diff --git a/runcoms/zprofile b/runcoms/zprofile
index 08d39be1..4daeb13e 100644
--- a/runcoms/zprofile
+++ b/runcoms/zprofile
@@ -67,7 +67,7 @@ fi
 #
 
 if [[ ! -d "$TMPDIR" ]]; then
-  export TMPDIR="/tmp/$USER"
+  export TMPDIR="/tmp/$LOGNAME"
   mkdir -p -m 700 "$TMPDIR"
 fi
 

From 933c61b8f1af64e745260f3c92d32fa08399688d Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Sun, 22 Feb 2015 21:42:11 -0500
Subject: [PATCH 15/21] [Fix #776] Support GNU top

---
 modules/utility/init.zsh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/utility/init.zsh b/modules/utility/init.zsh
index 491af6ad..8d3b3b46 100644
--- a/modules/utility/init.zsh
+++ b/modules/utility/init.zsh
@@ -146,8 +146,13 @@ alias du='du -kh'
 if (( $+commands[htop] )); then
   alias top=htop
 else
-  alias topc='top -o cpu'
-  alias topm='top -o vsize'
+  if [[ "$OSTYPE" == darwin*|*bsd* ]]; then
+    alias topc='top -o cpu'
+    alias topm='top -o vsize'
+  else
+    alias topc='top -o %CPU'
+    alias topm='top -o %MEM'
+  fi
 fi
 
 # Miscellaneous

From 1292587f95eab49f0cc5b3e78b922f37fd87cc0b Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Sun, 22 Feb 2015 21:53:40 -0500
Subject: [PATCH 16/21] [Fix #777] Check for nvm or node

---
 modules/node/init.zsh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/node/init.zsh b/modules/node/init.zsh
index 6fedb3c8..0ad5d19e 100644
--- a/modules/node/init.zsh
+++ b/modules/node/init.zsh
@@ -6,6 +6,11 @@
 #   Zeh Rizzatti <zehrizzatti@gmail.com>
 #
 
+# Return if requirements are not found.
+if (( ! $+commands[nvm] || ! $+commands[node] )); then
+  return 1
+fi
+
 # Load manually installed NVM into the shell session.
 if [[ -s "$HOME/.nvm/nvm.sh" ]]; then
   source "$HOME/.nvm/nvm.sh"

From ab45ade380c3b56f003355286dd4f542578439c1 Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Sun, 22 Feb 2015 21:56:12 -0500
Subject: [PATCH 17/21] [Fix #801] Make $TMPPREFIX a file path

---
 runcoms/zprofile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/runcoms/zprofile b/runcoms/zprofile
index 4daeb13e..d87cb3b0 100644
--- a/runcoms/zprofile
+++ b/runcoms/zprofile
@@ -72,6 +72,3 @@ if [[ ! -d "$TMPDIR" ]]; then
 fi
 
 TMPPREFIX="${TMPDIR%/}/zsh"
-if [[ ! -d "$TMPPREFIX" ]]; then
-  mkdir -p "$TMPPREFIX"
-fi

From b41f4855286cd9ec2b00f7c8d91a6e2778009d51 Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Sun, 22 Feb 2015 23:52:41 -0500
Subject: [PATCH 18/21] Add missing parenthesis

The bug was introduced in 933c61b.
---
 modules/utility/init.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/utility/init.zsh b/modules/utility/init.zsh
index 8d3b3b46..30fee32a 100644
--- a/modules/utility/init.zsh
+++ b/modules/utility/init.zsh
@@ -146,7 +146,7 @@ alias du='du -kh'
 if (( $+commands[htop] )); then
   alias top=htop
 else
-  if [[ "$OSTYPE" == darwin*|*bsd* ]]; then
+  if [[ "$OSTYPE" == (darwin*|*bsd*) ]]; then
     alias topc='top -o cpu'
     alias topm='top -o vsize'
   else

From e144abb285af842ae99d7418298ac6070a63d223 Mon Sep 17 00:00:00 2001
From: Tobias Witt <tobias.witt@hhu.de>
Date: Mon, 23 Feb 2015 17:23:28 +0100
Subject: [PATCH 19/21] Fix node-module

The change recently introduced for #777 was actually breaking the module
completely, as it was only loaded if neither `node` nor `nvm`
were available.
---
 modules/node/init.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/node/init.zsh b/modules/node/init.zsh
index 0ad5d19e..01fa0c87 100644
--- a/modules/node/init.zsh
+++ b/modules/node/init.zsh
@@ -7,7 +7,7 @@
 #
 
 # Return if requirements are not found.
-if (( ! $+commands[nvm] || ! $+commands[node] )); then
+if (( ! $+commands[nvm] && ! $+commands[node] )); then
   return 1
 fi
 

From ee0b02464ca29b551169d0a33a43aeef979d78ea Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Tue, 24 Feb 2015 15:29:25 -0500
Subject: [PATCH 20/21] [Fix #819] Check for node as a last resort

---
 modules/node/init.zsh | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/modules/node/init.zsh b/modules/node/init.zsh
index 01fa0c87..6d600789 100644
--- a/modules/node/init.zsh
+++ b/modules/node/init.zsh
@@ -6,11 +6,6 @@
 #   Zeh Rizzatti <zehrizzatti@gmail.com>
 #
 
-# Return if requirements are not found.
-if (( ! $+commands[nvm] && ! $+commands[node] )); then
-  return 1
-fi
-
 # Load manually installed NVM into the shell session.
 if [[ -s "$HOME/.nvm/nvm.sh" ]]; then
   source "$HOME/.nvm/nvm.sh"
@@ -18,10 +13,9 @@ if [[ -s "$HOME/.nvm/nvm.sh" ]]; then
 # Load package manager installed NVM into the shell session.
 elif (( $+commands[brew] )) && [[ -d "$(brew --prefix nvm 2>/dev/null)" ]]; then
   source $(brew --prefix nvm)/nvm.sh
-fi
 
 # Return if requirements are not found.
-if (( ! $+commands[node] )); then
+elif (( ! $+commands[node] )); then
   return 1
 fi
 

From c34098af20cafdf016f68f3e7f612ed60ca93aa1 Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Sun, 8 Mar 2015 23:38:06 -0400
Subject: [PATCH 21/21] Update copyright

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 42c68532..e54a6319 100644
--- a/README.md
+++ b/README.md
@@ -86,7 +86,8 @@ License
 (The MIT License)
 
 Copyright (c) 2009-2011 Robby Russell and contributors.
-Copyright (c) 2011-2014 Sorin Ionescu and contributors.
+
+Copyright (c) 2011-2015 Sorin Ionescu and contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in