From 2de523eb178e18ff37f43db841eeab0fde6a79ed Mon Sep 17 00:00:00 2001
From: Colin Hebert <hebert.colin@gmail.com>
Date: Fri, 7 Sep 2012 03:48:46 +0100
Subject: [PATCH] Use the init.zsh parent folder as the PREZTO_HOME folder

---
 helper.zsh | 12 ++++++------
 init.zsh   |  6 ++++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/helper.zsh b/helper.zsh
index 7581873a..cdc33075 100644
--- a/helper.zsh
+++ b/helper.zsh
@@ -40,7 +40,7 @@ function pmodload {
   pmodules=("$argv[@]")
 
   # Add functions to $fpath.
-  fpath=(${pmodules:+${ZDOTDIR:-$HOME}/.zprezto/modules/${^pmodules}/functions(/FN)} $fpath)
+  fpath=(${pmodules:+$PREZTO_HOME/modules/${^pmodules}/functions(/FN)} $fpath)
 
   function {
     local pfunction
@@ -49,7 +49,7 @@ function pmodload {
     setopt LOCAL_OPTIONS EXTENDED_GLOB
 
     # Load Prezto functions.
-    for pfunction in ${ZDOTDIR:-$HOME}/.zprezto/modules/${^pmodules}/functions/$~pfunction_glob; do
+    for pfunction in $PREZTO_HOME/modules/${^pmodules}/functions/$~pfunction_glob; do
       autoload -Uz "$pfunction"
     done
   }
@@ -58,12 +58,12 @@ function pmodload {
   for pmodule in "$pmodules[@]"; do
     if zstyle -t ":prezto:module:$pmodule" loaded; then
       continue
-    elif [[ ! -d "${ZDOTDIR:-$HOME}/.zprezto/modules/$pmodule" ]]; then
+    elif [[ ! -d "$PREZTO_HOME/modules/$pmodule" ]]; then
       print "$0: no such module: $pmodule" >&2
       continue
     else
-      if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/modules/$pmodule/init.zsh" ]]; then
-        source "${ZDOTDIR:-$HOME}/.zprezto/modules/$pmodule/init.zsh"
+      if [[ -s "$PREZTO_HOME/modules/$pmodule/init.zsh" ]]; then
+        source "$PREZTO_HOME/modules/$pmodule/init.zsh"
       fi
 
       if (( $? == 0 )); then
@@ -80,7 +80,7 @@ function pmodload {
           setopt LOCAL_OPTIONS EXTENDED_GLOB
 
           # Unload Prezto functions.
-          for pfunction in ${ZDOTDIR:-$HOME}/.zprezto/modules/$pmodule/functions/$~pfunction_glob; do
+          for pfunction in $PREZTO_HOME/modules/$pmodule/functions/$~pfunction_glob; do
             unfunction "$pfunction"
           done
         }
diff --git a/init.zsh b/init.zsh
index f1752cbd..2e11c838 100644
--- a/init.zsh
+++ b/init.zsh
@@ -18,6 +18,9 @@ if [[ -s "${ZDOTDIR:-$HOME}/.zpreztorc" ]]; then
   source "${ZDOTDIR:-$HOME}/.zpreztorc"
 fi
 
+# Set prezto location
+export PREZTO_HOME="${0:h}"
+
 # Disable color and theme in dumb terminals.
 if [[ "$TERM" == 'dumb' ]]; then
   zstyle ':prezto:*:*' color 'no'
@@ -35,10 +38,9 @@ for zfunction ("$zfunctions[@]") autoload -Uz "$zfunction"
 unset zfunction{s,}
 
 # Source files (the order matters).
-source "${0:h}/helper.zsh"
+source "$PREZTO_HOME/helper.zsh"
 
 # Load Prezto modules.
 zstyle -a ':prezto:load' pmodule 'pmodules'
 pmodload "$pmodules[@]"
 unset pmodules
-