Merge branch 'portability' of github.com:benohara/oh-my-zsh into portability

init.zsh

@@ -7,10 +7,9 @@
 #
 
 # 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
   print "omz: old shell detected, minimum required: $min_zsh_version" >&2
-  return 1
 fi
 unset min_zsh_version
 

modules/editor/init.zsh

@@ -40,6 +40,13 @@
 #     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.
 if [[ "$TERM" == 'dumb' ]]; then
   return 1

modules/git/init.zsh

@@ -5,6 +5,10 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
+if (( ! $+commands[git] )); then
+  return 1
+fi
+
 # Source module files.
 source "${0:h}/alias.zsh"
 source "${0:h}/hub.zsh"

modules/history-substring-search/init.zsh

@@ -6,6 +6,13 @@
 #   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"
 
 if zstyle -t ':omz:module:history-substring-search' case-sensitive; then

modules/rsync/init.zsh

@@ -5,6 +5,10 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
+if (( ! $+commands[rsync] )); then
+  return 1
+fi
+
 # Aliases
 _rsync_cmd='rsync --verbose --progress --human-readable --compress --archive --hard-links --one-file-system'
 

modules/screen/init.zsh

@@ -5,6 +5,10 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
+if (( ! $+commands[screen] )); then
+  return 1
+fi
+
 # Aliases
 alias sl="screen -list"
 alias sn="screen -U -S"

modules/syntax-highlighting/init.zsh

@@ -5,6 +5,13 @@
 #   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
   source "${0:h}/external/zsh-syntax-highlighting.zsh"
 

modules/terminal/init.zsh

@@ -6,6 +6,13 @@
 #   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.
 if [[ "$TERM" == 'dumb' ]]; then
   return 1

modules/tmux/init.zsh

@@ -6,6 +6,10 @@
 #   Colin Hebert <hebert.colin@gmail.com>
 #
 
+if (( ! $+commands[tmux] )); then
+  return 1
+fi
+
 # Aliases
 alias ta="tmux attach-session"
 alias tl="tmux list-sessions"

modules/utility/init.zsh

@@ -56,7 +56,9 @@ alias type='type -a'
 # ls
 if is-callable 'dircolors'; then
   # GNU Core Utilities
-  alias ls='ls --group-directories-first'
+  if [[ `dircolors --version |head -1 |awk '{print $NF}'` > 6 ]]; then
+    alias ls='ls --group-directories-first'
+  fi
 
   if zstyle -t ':omz:module:utility:ls' color; then
     if [[ -s "$HOME/.dir_colors" ]]; then