1
0
Fork 0

Use the init.zsh parent folder as the PREZTO_HOME folder

pull/271/head
Colin Hebert 12 years ago
parent 0f7e454977
commit 2de523eb17

@ -40,7 +40,7 @@ function pmodload {
pmodules=("$argv[@]") pmodules=("$argv[@]")
# Add functions to $fpath. # Add functions to $fpath.
fpath=(${pmodules:+${ZDOTDIR:-$HOME}/.zprezto/modules/${^pmodules}/functions(/FN)} $fpath) fpath=(${pmodules:+$PREZTO_HOME/modules/${^pmodules}/functions(/FN)} $fpath)
function { function {
local pfunction local pfunction
@ -49,7 +49,7 @@ function pmodload {
setopt LOCAL_OPTIONS EXTENDED_GLOB setopt LOCAL_OPTIONS EXTENDED_GLOB
# Load Prezto functions. # 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" autoload -Uz "$pfunction"
done done
} }
@ -58,12 +58,12 @@ function pmodload {
for pmodule in "$pmodules[@]"; do for pmodule in "$pmodules[@]"; do
if zstyle -t ":prezto:module:$pmodule" loaded; then if zstyle -t ":prezto:module:$pmodule" loaded; then
continue continue
elif [[ ! -d "${ZDOTDIR:-$HOME}/.zprezto/modules/$pmodule" ]]; then elif [[ ! -d "$PREZTO_HOME/modules/$pmodule" ]]; then
print "$0: no such module: $pmodule" >&2 print "$0: no such module: $pmodule" >&2
continue continue
else else
if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/modules/$pmodule/init.zsh" ]]; then if [[ -s "$PREZTO_HOME/modules/$pmodule/init.zsh" ]]; then
source "${ZDOTDIR:-$HOME}/.zprezto/modules/$pmodule/init.zsh" source "$PREZTO_HOME/modules/$pmodule/init.zsh"
fi fi
if (( $? == 0 )); then if (( $? == 0 )); then
@ -80,7 +80,7 @@ function pmodload {
setopt LOCAL_OPTIONS EXTENDED_GLOB setopt LOCAL_OPTIONS EXTENDED_GLOB
# Unload Prezto functions. # 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" unfunction "$pfunction"
done done
} }

@ -18,6 +18,9 @@ if [[ -s "${ZDOTDIR:-$HOME}/.zpreztorc" ]]; then
source "${ZDOTDIR:-$HOME}/.zpreztorc" source "${ZDOTDIR:-$HOME}/.zpreztorc"
fi fi
# Set prezto location
export PREZTO_HOME="${0:h}"
# Disable color and theme in dumb terminals. # Disable color and theme in dumb terminals.
if [[ "$TERM" == 'dumb' ]]; then if [[ "$TERM" == 'dumb' ]]; then
zstyle ':prezto:*:*' color 'no' zstyle ':prezto:*:*' color 'no'
@ -35,10 +38,9 @@ for zfunction ("$zfunctions[@]") autoload -Uz "$zfunction"
unset zfunction{s,} unset zfunction{s,}
# Source files (the order matters). # Source files (the order matters).
source "${0:h}/helper.zsh" source "$PREZTO_HOME/helper.zsh"
# Load Prezto modules. # Load Prezto modules.
zstyle -a ':prezto:load' pmodule 'pmodules' zstyle -a ':prezto:load' pmodule 'pmodules'
pmodload "$pmodules[@]" pmodload "$pmodules[@]"
unset pmodules unset pmodules

Loading…
Cancel
Save