Merge branch 'portability' of github.com:benohara/oh-my-zsh into portability
This commit is contained in:
commit
54006c8c8e
10 changed files with 48 additions and 3 deletions
3
init.zsh
3
init.zsh
|
@ -7,10 +7,9 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
# Check for the minimum supported version.
|
# Check for the minimum supported version.
|
||||||
min_zsh_version='4.3.10'
|
min_zsh_version='4.2.6'
|
||||||
if ! autoload -Uz is-at-least || ! is-at-least "$min_zsh_version"; then
|
if ! autoload -Uz is-at-least || ! is-at-least "$min_zsh_version"; then
|
||||||
print "omz: old shell detected, minimum required: $min_zsh_version" >&2
|
print "omz: old shell detected, minimum required: $min_zsh_version" >&2
|
||||||
return 1
|
|
||||||
fi
|
fi
|
||||||
unset min_zsh_version
|
unset min_zsh_version
|
||||||
|
|
||||||
|
|
|
@ -40,6 +40,13 @@
|
||||||
# zstyle ':omz:module:editor' completing '...'
|
# zstyle ':omz:module:editor' completing '...'
|
||||||
#
|
#
|
||||||
|
|
||||||
|
# Check for the minimum supported version.
|
||||||
|
min_zsh_version='4.3.10'
|
||||||
|
if ! autoload -Uz is-at-least || ! is-at-least "$min_zsh_version"; then
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
unset min_zsh_version
|
||||||
|
|
||||||
# Dumb terminals lack support.
|
# Dumb terminals lack support.
|
||||||
if [[ "$TERM" == 'dumb' ]]; then
|
if [[ "$TERM" == 'dumb' ]]; then
|
||||||
return 1
|
return 1
|
||||||
|
|
|
@ -5,6 +5,10 @@
|
||||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||||
#
|
#
|
||||||
|
|
||||||
|
if (( ! $+commands[git] )); then
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
# Source module files.
|
# Source module files.
|
||||||
source "${0:h}/alias.zsh"
|
source "${0:h}/alias.zsh"
|
||||||
source "${0:h}/hub.zsh"
|
source "${0:h}/hub.zsh"
|
||||||
|
|
|
@ -6,6 +6,13 @@
|
||||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||||
#
|
#
|
||||||
|
|
||||||
|
# Check for the minimum supported version.
|
||||||
|
min_zsh_version='4.3.10'
|
||||||
|
if ! autoload -Uz is-at-least || ! is-at-least "$min_zsh_version"; then
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
unset min_zsh_version
|
||||||
|
|
||||||
source "${0:h}/external/zsh-history-substring-search.zsh"
|
source "${0:h}/external/zsh-history-substring-search.zsh"
|
||||||
|
|
||||||
if zstyle -t ':omz:module:history-substring-search' case-sensitive; then
|
if zstyle -t ':omz:module:history-substring-search' case-sensitive; then
|
||||||
|
|
|
@ -5,6 +5,10 @@
|
||||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||||
#
|
#
|
||||||
|
|
||||||
|
if (( ! $+commands[rsync] )); then
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
# Aliases
|
# Aliases
|
||||||
_rsync_cmd='rsync --verbose --progress --human-readable --compress --archive --hard-links --one-file-system'
|
_rsync_cmd='rsync --verbose --progress --human-readable --compress --archive --hard-links --one-file-system'
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,10 @@
|
||||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||||
#
|
#
|
||||||
|
|
||||||
|
if (( ! $+commands[screen] )); then
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
# Aliases
|
# Aliases
|
||||||
alias sl="screen -list"
|
alias sl="screen -list"
|
||||||
alias sn="screen -U -S"
|
alias sn="screen -U -S"
|
||||||
|
|
|
@ -5,6 +5,13 @@
|
||||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||||
#
|
#
|
||||||
|
|
||||||
|
# Check for the minimum supported version.
|
||||||
|
min_zsh_version='4.3.10'
|
||||||
|
if ! autoload -Uz is-at-least || ! is-at-least "$min_zsh_version"; then
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
unset min_zsh_version
|
||||||
|
|
||||||
if zstyle -t ':omz:module:syntax-highlighting' color; then
|
if zstyle -t ':omz:module:syntax-highlighting' color; then
|
||||||
source "${0:h}/external/zsh-syntax-highlighting.zsh"
|
source "${0:h}/external/zsh-syntax-highlighting.zsh"
|
||||||
|
|
||||||
|
|
|
@ -6,6 +6,13 @@
|
||||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||||
#
|
#
|
||||||
|
|
||||||
|
# Check for the minimum supported version.
|
||||||
|
min_zsh_version='4.3.10'
|
||||||
|
if ! autoload -Uz is-at-least || ! is-at-least "$min_zsh_version"; then
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
unset min_zsh_version
|
||||||
|
|
||||||
# Dumb terminals lack support.
|
# Dumb terminals lack support.
|
||||||
if [[ "$TERM" == 'dumb' ]]; then
|
if [[ "$TERM" == 'dumb' ]]; then
|
||||||
return 1
|
return 1
|
||||||
|
|
|
@ -6,6 +6,10 @@
|
||||||
# Colin Hebert <hebert.colin@gmail.com>
|
# Colin Hebert <hebert.colin@gmail.com>
|
||||||
#
|
#
|
||||||
|
|
||||||
|
if (( ! $+commands[tmux] )); then
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
# Aliases
|
# Aliases
|
||||||
alias ta="tmux attach-session"
|
alias ta="tmux attach-session"
|
||||||
alias tl="tmux list-sessions"
|
alias tl="tmux list-sessions"
|
||||||
|
|
|
@ -56,7 +56,9 @@ alias type='type -a'
|
||||||
# ls
|
# ls
|
||||||
if is-callable 'dircolors'; then
|
if is-callable 'dircolors'; then
|
||||||
# GNU Core Utilities
|
# GNU Core Utilities
|
||||||
|
if [[ `dircolors --version |head -1 |awk '{print $NF}'` > 6 ]]; then
|
||||||
alias ls='ls --group-directories-first'
|
alias ls='ls --group-directories-first'
|
||||||
|
fi
|
||||||
|
|
||||||
if zstyle -t ':omz:module:utility:ls' color; then
|
if zstyle -t ':omz:module:utility:ls' color; then
|
||||||
if [[ -s "$HOME/.dir_colors" ]]; then
|
if [[ -s "$HOME/.dir_colors" ]]; then
|
||||||
|
|
Loading…
Add table
Reference in a new issue