1
0
mirror of https://github.com/dcarrillo/prezto.git synced 2025-07-01 16:19:26 +00:00

Compare commits

...

5 Commits

Author SHA1 Message Date
72f8d15b21 Allow perlbrew environment to be loaded via zstyle 2014-02-17 23:40:39 -05:00
7722dd4400 Inform the user to load ruby as late as possible when using RVM 2014-02-17 23:39:22 -05:00
240eecaddf [Fix #551] Rename tmux auto-start session 2014-02-17 23:27:03 -05:00
415e4bff3d Fix a test operator bug introduced in e5a0e33 2014-02-17 23:09:11 -05:00
e5a0e33f1c [Fix #541] Do not auto-load screen/tmux inside of Emacs/Vim
When Emacs and Vim are launched from outside of an interactive shell,
$TMUX and $STY are not set; check for Emacs and Vim environment
variables instead.

Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
2014-02-17 22:43:49 -05:00
5 changed files with 17 additions and 3 deletions

View File

@ -30,6 +30,10 @@ Perlbrew
An alternative to the above is to use [Perlbrew][2], which allows for the An alternative to the above is to use [Perlbrew][2], which allows for the
management of multiple, isolated Perl installations in the home directory. management of multiple, isolated Perl installations in the home directory.
You can specify the perlbrew location so the environment is automatically loaded.
zstyle ':prezto:module:perl:perlbrew' location '/path/to/perlbrew'
Aliases Aliases
------- -------

View File

@ -29,6 +29,13 @@ if [[ "$OSTYPE" == darwin* ]]; then
unset perl_path unset perl_path
unset cache_file unset cache_file
# Perlbrew
zstyle -s ':prezto:module:perl:perlbrew' location '_perlbrew_root'
if [[ -s "${_perlbrew_root}/etc/bashrc" ]]; then
export PERLBREW_ROOT="${_perlbrew_root}"
source "${_perlbrew_root}/etc/bashrc"
fi
fi fi
# #

View File

@ -20,6 +20,9 @@ home directory.
Since RVM is loaded into the shell and is known to override shell commands, it Since RVM is loaded into the shell and is known to override shell commands, it
may conflict with shell scripts. may conflict with shell scripts.
Load this module as late as possible when using RVM since RVM will complain if
it is not first in `$PATH`.
rbenv rbenv
----- -----

View File

@ -15,7 +15,7 @@ fi
# Auto Start # Auto Start
# #
if [[ -z "$STY" ]] && ( \ if [[ -z "$STY" && ( -z "$INSIDE_EMACS" || -z "$EMACS" || -z "$VIM" ) ]] && ( \
( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:screen:auto-start' remote ) || ( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:screen:auto-start' remote ) ||
( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:screen:auto-start' local ) \ ( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:screen:auto-start' local ) \
); then ); then

View File

@ -16,11 +16,11 @@ fi
# Auto Start # Auto Start
# #
if [[ -z "$TMUX" ]] && ( \ if [[ -z "$TMUX" && ( -z "$INSIDE_EMACS" || -z "$EMACS" || -z "$VIM" ) ]] && ( \
( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' remote ) || ( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' remote ) ||
( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' local ) \ ( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' local ) \
); then ); then
tmux_session='#Prezto' tmux_session='prezto'
if ! tmux has-session -t "$tmux_session" 2> /dev/null; then if ! tmux has-session -t "$tmux_session" 2> /dev/null; then
# Ensure that tmux server is started. # Ensure that tmux server is started.