[WIP] Add install and uninstall scripts

Only set up environment for the top-level shell, and allow it to be
inherited normally.

A top level shell is usually a login shell, but can also be a
non-interactive, non-login shell in certain cases, such as when
executing an SSH remote command.

Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>

README.md

@@ -9,34 +9,30 @@ Installation
 ------------
 
 Prezto will work with any recent release of Zsh, but the minimum recommended
-version is 4.3.10.
+version is 4.3.11. Unfortunately, [Cygwin][9] is not supported due to
+non-standard core utilities.
 
   1. Launch Zsh:
 
         zsh
 
-  2. Set the path to the Prezto installation directory:
+  2. Clone the repository:
 
-      ZDOTDIR="${ZDOTDIR:-$HOME}"
+        git clone --recursive https://github.com/sorin-ionescu/prezto.git "${ZDOTDIR:-$HOME}/.zprezto"
-      PREZTO="$ZDOTDIR/.zprezto"
 
-  3. Clone the repository:
+  3. Create a new Zsh configuration by copying the Zsh configuration files
-
-        git clone --recursive https://github.com/sorin-ionescu/prezto.git "$PREZTO"
-
-  4. Create a new Zsh configuration by copying the Zsh configuration files
      provided:
 
         setopt EXTENDED_GLOB
-        for rcfile in "$PREZTO/runcoms/^README.md(.N); do
+        for rcfile in "${ZDOTDIR:-$HOME}"/.zprezto/runcoms/^README.md(.N); do
-          ln -s "$rcfile" "${ZDOTDIR}/.${rcfile:t}"
+          ln -s "$rcfile" "${ZDOTDIR:-$HOME}/.${rcfile:t}"
         done
 
-  5. Set Zsh as your default shell:
+  4. Set Zsh as your default shell:
 
         chsh -s /bin/zsh
 
-  6. Open a new Zsh terminal window or tab.
+  5. Open a new Zsh terminal window or tab.
 
 ### Troubleshooting
 
@@ -44,6 +40,13 @@ If you are not able to find certain commands after switching to *Prezto*,
 modify the `PATH` variable in *~/.zshenv* then open a new Zsh terminal
 window or tab.
 
+Updating
+--------
+
+Pull the latest changes and update submodules.
+
+    git pull && git submodule update --init --recursive
+
 Usage
 -----
 
@@ -83,7 +86,7 @@ License
 
 (The MIT License)
 
-Copyright (c) 2009-2012 Robby Russell, Sorin Ionescu, and contributors.
+Copyright (c) 2009-2014 Sorin Ionescu and contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -111,4 +114,5 @@ SOFTWARE.
 [6]: http://gitref.org
 [7]: http://www.bash2zsh.com/zsh_refcard/refcard.pdf
 [8]: http://grml.org/zsh/zsh-lovers.html
+[9]: http://www.cygwin.com
 

init.zsh

@@ -10,7 +10,7 @@
 #
 
 # Check for the minimum supported version.
-min_zsh_version='4.3.10'
+min_zsh_version='4.3.11'
 if ! autoload -Uz is-at-least || ! is-at-least "$min_zsh_version"; then
   print "prezto: old shell detected, minimum required: $min_zsh_version" >&2
   return 1
@@ -31,7 +31,7 @@ function pmodload {
   pmodules=("$argv[@]")
 
   # Add functions to $fpath.
-  fpath=(${pmodules:+$PREZTO/modules/${^pmodules}/functions(/FN)} $fpath)
+  fpath=(${pmodules:+${ZDOTDIR:-$HOME}/.zprezto/modules/${^pmodules}/functions(/FN)} $fpath)
 
   function {
     local pfunction
@@ -40,7 +40,7 @@ function pmodload {
     setopt LOCAL_OPTIONS EXTENDED_GLOB
 
     # Load Prezto functions.
-    for pfunction in $PREZTO/modules/${^pmodules}/functions/$~pfunction_glob; do
+    for pfunction in ${ZDOTDIR:-$HOME}/.zprezto/modules/${^pmodules}/functions/$~pfunction_glob; do
       autoload -Uz "$pfunction"
     done
   }
@@ -49,19 +49,19 @@ function pmodload {
   for pmodule in "$pmodules[@]"; do
     if zstyle -t ":prezto:module:$pmodule" loaded 'yes' 'no'; then
       continue
-    elif [[ ! -d "$PREZTO/modules/$pmodule" ]]; then
+    elif [[ ! -d "${ZDOTDIR:-$HOME}/.zprezto/modules/$pmodule" ]]; then
       print "$0: no such module: $pmodule" >&2
       continue
     else
-      if [[ -s "$PREZTO/modules/$pmodule/init.zsh" ]]; then
+      if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/modules/$pmodule/init.zsh" ]]; then
-        source "$PREZTO/modules/$pmodule/init.zsh"
+        source "${ZDOTDIR:-$HOME}/.zprezto/modules/$pmodule/init.zsh"
       fi
 
       if (( $? == 0 )); then
         zstyle ":prezto:module:$pmodule" loaded 'yes'
       else
         # Remove the $fpath entry.
-        fpath[(r)$PREZTO/modules/${pmodule}/functions]=()
+        fpath[(r)${ZDOTDIR:-$HOME}/.zprezto/modules/${pmodule}/functions]=()
 
         function {
           local pfunction
@@ -71,7 +71,7 @@ function pmodload {
           setopt LOCAL_OPTIONS EXTENDED_GLOB
 
           # Unload Prezto functions.
-          for pfunction in $PREZTO/modules/$pmodule/functions/$~pfunction_glob; do
+          for pfunction in ${ZDOTDIR:-$HOME}/.zprezto/modules/$pmodule/functions/$~pfunction_glob; do
             unfunction "$pfunction"
           done
         }
@@ -87,8 +87,8 @@ function pmodload {
 #
 
 # Source the Prezto configuration file.
-if [[ -s "$ZDOTDIR/.zpreztorc" ]]; then
+if [[ -s "${ZDOTDIR:-$HOME}/.zpreztorc" ]]; then
-  source "$ZDOTDIR/.zpreztorc"
+  source "${ZDOTDIR:-$HOME}/.zpreztorc"
 fi
 
 # Disable color and theme in dumb terminals.

modules/README.md

@@ -31,6 +31,16 @@ Dpkg
 
 Defines dpkg aliases and functions.
 
+Editor
+------
+
+Sets key bindings.
+
+Emacs
+-----
+
+Enables Emacs dependency management.
+
 Environment
 -----------
 
@@ -41,13 +51,19 @@ Fasd
 
 Maintains a frequently used file and directory list for fast access.
 
+Git
+---
+
+Enhances the Git distributed version control system by providing aliases,
+functions and by exposing repository status information to prompts.
+
 GNU Utility
 -----------
 
 Provides for the interactive use of GNU utilities on non-GNU systems.
 
 GPG
----------
+---
 
 Provides for an easier use of GPG by setting up gpg-agent.
 
@@ -61,16 +77,16 @@ Helper
 
 Provides helper functions for developing modules.
 
-History Substring Search
-------------------------
-
-Integrates zsh-history-substring-search into Prezto.
-
 History
 -------
 
 Sets history options and defines history aliases.
 
+History Substring Search
+------------------------
+
+Integrates zsh-history-substring-search into Prezto.
+
 Homebrew
 --------
 
@@ -86,6 +102,11 @@ Node.js
 
 Provides utility functions for Node.js and loads npm completion.
 
+Ocaml
+-----
+
+Initializes Ocaml package management.
+
 OSX
 ---
 
@@ -137,10 +158,10 @@ Spectrum
 
 Provides for easier use of 256 colors and effects.
 
-SSH-Agent
+SSH
----------
+---
 
-Provides for an easier use of ssh-agent.
+Provides for an easier use of SSH by setting up ssh-agent.
 
 Syntax Highlighting
 -------------------

modules/command-not-found/README.md

@@ -1,7 +1,8 @@
 Command-Not-Found
 =================
 
-Loads the [command-not-found][1] tool on Debian-based distributions.
+Displays installation information for not found commands by loading the
+[command-not-found][1] tool on Debian-based and Arch Linux-based distributions.
 
 Authors
 -------

modules/command-not-found/init.zsh

@@ -5,10 +5,14 @@
 #   Joseph Jon Booker <joe@neoturbine.net>
 #
 
+# Load command-not-found on Debian-based distributions.
+if [[ -s '/etc/zsh_command_not_found' ]]; then
+  source '/etc/zsh_command_not_found'
+# Load command-not-found on Arch Linux-based distributions.
+elif [[ -s '/usr/share/doc/pkgfile/command-not-found.zsh' ]]; then
+  source '/usr/share/doc/pkgfile/command-not-found.zsh'
 # Return if requirements are not found.
-if [[ ! -s '/etc/zsh_command_not_found' ]]; then
+else
   return 1
 fi
 
-source '/etc/zsh_command_not_found'
-

modules/completion/init.zsh

@@ -36,7 +36,7 @@ unsetopt FLOW_CONTROL      # Disable start/stop characters in shell editor.
 
 # Use caching to make completion for cammands such as dpkg and apt usable.
 zstyle ':completion::complete:*' use-cache on
-zstyle ':completion::complete:*' cache-path "$ZDOTDIR/.zcompcache"
+zstyle ':completion::complete:*' cache-path "${ZDOTDIR:-$HOME}/.zcompcache"
 
 # Case-insensitive (all), partial-word, and then substring completion.
 if zstyle -t ':prezto:module:completion:*' case-sensitive; then

modules/history-substring-search/init.zsh

@@ -10,7 +10,7 @@
 pmodload 'editor'
 
 # Source module files.
-source "${0:h}/external/zsh-history-substring-search.zsh"
+source "${0:h}/external/zsh-history-substring-search.zsh" || return 1
 
 #
 # Search

modules/history/init.zsh

@@ -10,7 +10,7 @@
 # Variables
 #
 
-HISTFILE="$ZDOTDIR/.zhistory"    # The path to the history file.
+HISTFILE="${ZDOTDIR:-$HOME}/.zhistory"       # The path to the history file.
 HISTSIZE=10000                   # The maximum number of events to save in the internal history.
 SAVEHIST=10000                   # The maximum number of events to save in the history file.
 

modules/ocaml/README.md

@@ -0,0 +1,28 @@
+Ocaml
+=====
+
+Initializes [Ocaml][1] package management.
+
+OPAM
+----
+
+[OPAM][2] is a package manager for Ocaml.
+
+This module enables local package installation with OPAM by extending the
+relevant path and Ocaml variables.
+
+### Usage
+
+Install packages to your local package directory with `opam install`.
+
+Authors
+-------
+
+*The authors of this module should be contacted via the [issue tracker][3].*
+
+  - [Sebastian Wiesner](https://github.com/lunaryorn)
+
+[1]: http://ocaml.org/
+[2]: http://opam.ocamlpro.com/
+[3]: https://github.com/sorin-ionescu/prezto/issues
+

modules/ocaml/init.zsh

@@ -0,0 +1,15 @@
+#
+# Initializes Ocaml package management.
+#
+# Authors:
+#   Sebastian Wiesner <lunaryorn@gmail.com>
+#
+
+# Return if requirements are not found.
+if (( ! $+commands[opam] )); then
+  return 1
+fi
+
+# Initialize OPAM.
+eval "$(opam config env)"
+

modules/pacman/init.zsh

@@ -55,10 +55,10 @@ alias pacq='pacman --sync --info'
 alias pacQ='pacman --query --info'
 
 # Searches for packages in the repositories.
-alias pacs='pacman --sync --recursive'
+alias pacs='pacman --sync --search'
 
 # Searches for packages in the local database.
-alias pacS='pacman --query --recursive'
+alias pacS='pacman --query --search'
 
 # Lists orphan packages.
 alias pacman-list-orphans='sudo pacman --query --deps --unrequired'

modules/python/README.md

@@ -6,15 +6,15 @@ Enables local Python and local Python package installation.
 Local Python Installation
 -------------------------
 
-[pythonz][4] builds and installs multiple Python versions locally in the home
+[pyenv][4] builds and installs multiple Python versions locally in the home
 directory.
 
-This module prepends the pythonz directory to the path variable to enable the
+This module prepends the pyenv directory to the path variable to enable the
-execution of `pythonz`.
+execution of `pyenv`.
 
 ### Usage
 
-Install Python versions with `pythonz install` into *~/.pythonz/pythons*.
+Install Python versions with `pyenv install` into *~/.pyenv/versions*.
 
 Local Package Installation
 --------------------------
@@ -66,16 +66,6 @@ Aliases
 
   - `py` is short for `python`.
 
-### Pythonz
-
-  - `pyz` is short for `pythonz`.
-  - `pyzc` removes stale source folders and archives.
-  - `pyzi` installs Python versions.
-  - `pyzl` lists installed Python versions.
-  - `pyzL` lists available Python versions.
-  - `pyzu` updates itself to the latest version.
-  - `pyzx` uninstalls Python versions.
-
 Functions
 ---------
 
@@ -105,6 +95,6 @@ Authors
 [1]: http://www.python.org/dev/peps/pep-0370/
 [2]: http://www.doughellmann.com/projects/virtualenvwrapper/
 [3]: http://pypi.python.org/pypi/virtualenv
-[4]: http://saghul.github.com/pythonz/
+[4]: https://github.com/yyuu/pyenv
 [5]: https://github.com/sorin-ionescu/prezto/issues
 

modules/python/init.zsh

@@ -6,29 +6,35 @@
 #   Sebastian Wiesner <lunaryorn@googlemail.com>
 #
 
-# Load pythonz into the shell session.
+# Load manually installed pyenv into the shell session.
-if [[ -s $HOME/.pythonz/bin/pythonz ]]; then
+if [[ -s "$HOME/.pyenv/bin/pyenv" ]]; then
-  path=($HOME/.pythonz/bin $path)
+  path=("$HOME/.pyenv/bin" $path)
-fi
+  eval "$(pyenv init -)"
 
-# Return if requirements are not found.
+# Load package manager installed pyenv into the shell session.
-if (( ! $+commands[python] && ! $+commands[pythonz] )); then
+elif (( $+commands[pyenv] )); then
-  return 1
+  eval "$(pyenv init -)"
-fi
 
 # Prepend PEP 370 per user site packages directory, which defaults to
 # ~/Library/Python on Mac OS X and ~/.local elsewhere, to PATH.
-if [[ "$OSTYPE" == darwin* ]]; then
-  path=($HOME/Library/Python/*/bin(N) $path)
 else
-  # This is subject to change.
+  if [[ "$OSTYPE" == darwin* ]]; then
-  path=($HOME/.local/bin $path)
+    path=($HOME/Library/Python/*/bin(N) $path)
+  else
+    # This is subject to change.
+    path=($HOME/.local/bin $path)
+  fi
+fi
+
+# Return if requirements are not found.
+if (( ! $+commands[python] && ! $+commands[pyenv] )); then
+  return 1
 fi
 
 # Load virtualenvwrapper into the shell session.
 if (( $+commands[virtualenvwrapper_lazy.sh] )); then
   # Set the directory where virtual environments are stored.
-  export WORKON_HOME=$HOME/.virtualenvs
+  export WORKON_HOME="$HOME/.virtualenvs"
 
   # Disable the virtualenv prompt.
   VIRTUAL_ENV_DISABLE_PROMPT=1
@@ -42,14 +48,3 @@ fi
 
 alias py='python'
 
-# pythonz
-if (( $+commands[pythonz] )); then
-  alias pyz='pythonz'
-  alias pyzc='pythonz cleanup'
-  alias pyzi='pythonz install'
-  alias pyzl='pythonz list'
-  alias pyzL='pythonz list -a'
-  alias pyzu='pythonz update'
-  alias pyzx='pythonz uninstall'
-fi
-

modules/rails/init.zsh

@@ -7,39 +7,30 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
+# Load dependencies.
+pmodload 'ruby'
+
 # Return if requirements are not found.
-if (( ! $+commands[rails] )); then
+if (( ! $+commands[bundle] )); then
   return 1
 fi
 
 #
-# Aliases (Compatible with Rails 2)
+# Aliases
 #
 
-alias ror='rails'
+alias ror='bundle exec rails'
-alias rorc='_rails-command console'
+alias rorc='bundle exec rails console'
-alias rordc='_rails-command dbconsole'
+alias rordc='bundle exec rails dbconsole'
-alias rordm='rake db:migrate'
+alias rordm='bundle exec rake db:migrate'
-alias rordM='rake db:migrate db:test:clone'
+alias rordM='bundle exec rake db:migrate db:test:clone'
-alias rordr='rake db:rollback'
+alias rordr='bundle exec rake db:rollback'
-alias rorg='_rails-command generate'
+alias rorg='bundle exec rails generate'
-alias rorl='tail -f log/development.log'
+alias rorl='tail -f "$(ruby-app-root)/log/development.log"'
-alias rorlc='rake log:clear'
+alias rorlc='bundle exec rake log:clear'
-alias rorp='_rails-command plugin'
+alias rorp='bundle exec rails plugin'
-alias rorr='_rails-command runner'
+alias rorr='bundle exec rails runner'
-alias rors='_rails-command server'
+alias rors='bundle exec rails server'
-alias rorsd='_rails-command server --debugger'
+alias rorsd='bundle exec rails server --debugger'
-alias rorx='_rails-command destroy'
+alias rorx='bundle exec rails destroy'
-
-#
-# Functions
-#
-
-function _rails-command {
-  if [[ -e "script/server" ]]; then
-    ruby script/"$@"
-  else
-    ruby script/rails "$@"
-  fi
-}
 

modules/ruby/README.md

@@ -59,6 +59,7 @@ Aliases
 Functions
 ---------
 
+  - `ruby-app-root` displays the path to the Ruby application root directory.
   - `ruby-info` exposes information about the Ruby environment via the
     `$ruby_info` associative array.
 

modules/ruby/functions/ruby-app-root

@@ -0,0 +1,19 @@
+#
+# Displays the path to the Ruby application root directory.
+#
+# Authors:
+#   Sorin Ionescu <sorin.ionescu@gmail.com>
+#
+
+local root_dir="$PWD"
+
+while [[ "$root_dir" != '/' ]]; do
+  if [[ -f "$root_dir/Gemfile" ]]; then
+    print "$root_dir"
+    break
+  fi
+  root_dir="$root_dir:h"
+done
+
+return 1
+

modules/ruby/init.zsh

@@ -23,14 +23,9 @@ elif [[ -s "$HOME/.rbenv/bin/rbenv" ]]; then
 elif (( $+commands[rbenv] )); then
   eval "$(rbenv init - --no-rehash zsh)"
 
-# Install local gems according to operating system conventions.
+# Prepend local gems bin directories to PATH.
 else
-  if [[ "$OSTYPE" == darwin* ]]; then
+  path=($HOME/.gem/ruby/*/bin(N) $path)
-    export GEM_HOME="$HOME/Library/Ruby/Gems/1.8"
-    path=("$GEM_HOME/bin" $path)
-  else
-    path=($HOME/.gem/ruby/*/bin(N) $path)
-  fi
 fi
 
 # Return if requirements are not found.
@@ -49,7 +44,7 @@ alias rb='ruby'
 if (( $+commands[bundle] )); then
   alias rbb='bundle'
   alias rbbe='rbb exec'
-  alias rbbi='rbb install --path vendor/bundle'
+  alias rbbi='rbb install'
   alias rbbl='rbb list'
   alias rbbo='rbb open'
   alias rbbp='rbb package'
@@ -57,6 +52,8 @@ if (( $+commands[bundle] )); then
   alias rbbI='rbbi \
     && rbb package \
     && print .bundle       >>! .gitignore \
+    && print vendor/assets >>! .gitignore \
     && print vendor/bundle >>! .gitignore \
     && print vendor/cache  >>! .gitignore'
 fi
+

modules/ssh/init.zsh

@@ -21,10 +21,13 @@ _ssh_agent_sock="$TMPDIR/ssh-agent.sock"
 
 # Start ssh-agent if not started.
 if [[ ! -S "$SSH_AUTH_SOCK" ]]; then
-  eval "$(ssh-agent | sed '/^echo /d' | tee "$_ssh_agent_env")"
-else
   # Export environment variables.
   source "$_ssh_agent_env" 2> /dev/null
+
+  # Start ssh-agent if not started.
+  if ! ps -U "$USER" -o pid,ucomm | grep -q "${SSH_AGENT_PID} ssh-agent"; then
+    eval "$(ssh-agent | sed '/^echo /d' | tee "$_ssh_agent_env")"
+  fi
 fi
 
 # Create a persistent SSH authentication socket.

modules/syntax-highlighting/init.zsh

@@ -11,7 +11,7 @@ if ! zstyle -t ':prezto:module:syntax-highlighting' color; then
 fi
 
 # Source module files.
-source "${0:h}/external/zsh-syntax-highlighting.zsh"
+source "${0:h}/external/zsh-syntax-highlighting.zsh" || return 1
 
 # Set highlighters.
 zstyle -a ':prezto:module:syntax-highlighting' highlighters 'ZSH_HIGHLIGHT_HIGHLIGHTERS'

modules/terminal/README.md

@@ -13,23 +13,33 @@ directory, add the following to *zpreztorc*:
 
     zstyle ':prezto:module:terminal' auto-title 'yes'
 
+Auto titling is disabled inside terminal multiplexers, except inside dvtm, since
+it interferes with window names defined in configuration files and profile
+managers.
+
+To format terminal window and tab titles, add the following to *zpreztorc*:
+
+    zstyle ':prezto:module:terminal:window-title' format '%n@%m: %s'
+    zstyle ':prezto:module:terminal:tab-title' format '%m: %s'
+
+`%s` will be replaced with the current working directory path or the currently
+executing program name.
+
+For a list of sequences, see [Expansion of Prompt Sequences][1].
+
 Functions
 ---------
 
-- `set-screen-window-title` sets the screen title.
+- `set-tab-title` sets the terminal tab title.
-- `set-terminal-tab-title` sets the terminal tab title.
+- `set-window-title` sets the terminal or terminal multiplexer window title.
-- `set-terminal-window-title` sets the terminal window title.
-- `set-titles-with-command` sets the screen and terminal titles with
-  a given command.
-- `set-titles-with-path` sets the screen and terminal titles with a given path.
 
 Authors
 -------
 
-*The authors of this module should be contacted via the [issue tracker][1].*
+*The authors of this module should be contacted via the [issue tracker][2].*
 
-  - [James Cox](https://github.com/imajes)
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
-[1]: https://github.com/sorin-ionescu/prezto/issues
+[1]: http://zsh.sourceforge.net/Doc/Release/Prompt-Expansion.html#Expansion-of-Prompt-Sequences
+[2]: https://github.com/sorin-ionescu/prezto/issues
 

modules/terminal/init.zsh

@@ -2,7 +2,6 @@
 # Sets terminal window and tab titles.
 #
 # Authors:
-#   James Cox <james@imaj.es>
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
@@ -11,113 +10,115 @@ if [[ "$TERM" == 'dumb' ]]; then
   return 1
 fi
 
-# Set the GNU Screen window number.
+# Sets the terminal or terminal multiplexer window title.
-if [[ -n "$WINDOW" ]]; then
+function set-window-title {
-  export SCREEN_NO="%B${WINDOW}%b "
+  local title_format{,ted}
-else
+  zstyle -s ':prezto:module:terminal:window-title' format 'title_format' || title_format="%s"
-  export SCREEN_NO=""
+  zformat -f title_formatted "$title_format" "s:$argv"
-fi
 
-# Sets the GNU Screen title.
-function set-screen-window-title {
   if [[ "$TERM" == screen* ]]; then
-    printf "\ek%s\e\\" ${(V)argv}
+    title_format="\ek%s\e\\"
+  else
+    title_format="\e]2;%s\a"
   fi
-}
 
-# Sets the terminal window title.
+  printf "$title_format" "${(V%)title_formatted}"
-function set-terminal-window-title {
-  if [[ "$TERM" == ((x|a|ml|dt|E)term*|(u|)rxvt*) ]]; then
-    printf "\e]2;%s\a" ${(V)argv}
-  fi
 }
 
 # Sets the terminal tab title.
-function set-terminal-tab-title {
+function set-tab-title {
-  if [[ "$TERM" == ((x|a|ml|dt|E)term*|(u|)rxvt*) ]]; then
+  local title_format{,ted}
-    printf "\e]1;%s\a" ${(V)argv}
+  zstyle -s ':prezto:module:terminal:tab-title' format 'title_format' || title_format="%s"
-  fi
+  zformat -f title_formatted "$title_format" "s:$argv"
+
+  printf "\e]1;%s\a" ${(V%)title_formatted}
 }
 
 # Sets the tab and window titles with a given command.
-function set-titles-with-command {
+function _terminal-set-titles-with-command {
-  # Do not set the window and tab titles in Terminal.app because they are not
-  # reset upon command termination.
-  if [[ "$TERM_PROGRAM" == 'Apple_Terminal' ]]; then
-    return 1
-  fi
-
   emulate -L zsh
   setopt EXTENDED_GLOB
 
   # Get the command name that is under job control.
-  if [[ "${1[(w)1]}" == (fg|%*)(\;|) ]]; then
+  if [[ "${2[(w)1]}" == (fg|%*)(\;|) ]]; then
     # Get the job name, and, if missing, set it to the default %+.
-    local job_name="${${1[(wr)%*(\;|)]}:-%+}"
+    local job_name="${${2[(wr)%*(\;|)]}:-%+}"
 
     # Make a local copy for use in the subshell.
     local -A jobtexts_from_parent_shell
     jobtexts_from_parent_shell=(${(kv)jobtexts})
 
-    jobs $job_name 2>/dev/null > >(
+    jobs "$job_name" 2>/dev/null > >(
       read index discarded
       # The index is already surrounded by brackets: [1].
-      set-titles-with-command "${(e):-\$jobtexts_from_parent_shell$index}"
+      _terminal-set-titles-with-command "${(e):-\$jobtexts_from_parent_shell$index}"
     )
   else
     # Set the command name, or in the case of sudo or ssh, the next command.
-    local cmd=${${1[(wr)^(*=*|sudo|ssh|-*)]}:t}
+    local cmd="${${2[(wr)^(*=*|sudo|ssh|-*)]}:t}"
     local truncated_cmd="${cmd/(#m)?(#c15,)/${MATCH[1,12]}...}"
     unset MATCH
 
-    if [[ "$TERM" == screen* ]]; then
+    set-window-title "$cmd"
-      set-screen-window-title "$truncated_cmd"
+    set-tab-title "$truncated_cmd"
-    else
-      set-terminal-window-title "$cmd"
-      set-terminal-tab-title "$truncated_cmd"
-    fi
   fi
 }
 
 # Sets the tab and window titles with a given path.
-function set-titles-with-path {
+function _terminal-set-titles-with-path {
   emulate -L zsh
   setopt EXTENDED_GLOB
 
   local absolute_path="${${1:a}:-$PWD}"
+  local abbreviated_path="${absolute_path/#$HOME/~}"
+  local truncated_path="${abbreviated_path/(#m)?(#c15,)/...${MATCH[-12,-1]}}"
+  unset MATCH
 
-  if [[ "$TERM_PROGRAM" == 'Apple_Terminal' ]]; then
+  set-window-title "$abbreviated_path"
-    printf '\e]7;%s\a' "file://$HOST${absolute_path// /%20}"
+  set-tab-title "$truncated_path"
-  else
-    local abbreviated_path="${absolute_path/#$HOME/~}"
-    local truncated_path="${abbreviated_path/(#m)?(#c15,)/...${MATCH[-12,-1]}}"
-    unset MATCH
-
-    if [[ "$TERM" == screen* ]]; then
-      set-screen-window-title "$truncated_path"
-    else
-      set-terminal-window-title "$abbreviated_path"
-      set-terminal-tab-title "$truncated_path"
-    fi
-  fi
 }
 
-# Don't override precmd/preexec; append to hook array.
+# Sets the Terminal.app proxy icon.
+function _terminal-set-terminal-app-proxy-icon {
+  printf '\e]7;%s\a' "file://$HOST${${1:-$PWD}// /%20}"
+}
+
+# Do not override precmd/preexec; append to the hook array.
 autoload -Uz add-zsh-hook
 
-# Sets the tab and window titles before the prompt is displayed.
+# Set up the Apple Terminal.
-function set-titles-precmd {
+if [[ "$TERM_PROGRAM" == 'Apple_Terminal' ]] \
-  if zstyle -t ':prezto:module:terminal' auto-title; then
+  && ( ! [[ -n "$STY" || -n "$TMUX" || -n "$DVTM" ]] )
-    set-titles-with-path
+then
-  fi
+  # Sets the Terminal.app current working directory before the prompt is
-}
+	# displayed.
-add-zsh-hook precmd set-titles-precmd
+  add-zsh-hook precmd _terminal-set-terminal-app-proxy-icon
 
-# Sets the tab and window titles before command execution.
+	# Unsets the Terminal.app current working directory when a terminal
-function set-titles-preexec {
+	# multiplexer or remote connection is started since it can no longer be
-  if zstyle -t ':prezto:module:terminal' auto-title; then
+  # updated, and it becomes confusing when the directory displayed in the title
-    set-titles-with-command "$2"
+  # bar is no longer synchronized with real current working directory.
-  fi
+	function _terminal-unset-terminal-app-proxy-icon {
-}
+    if [[ "${2[(w)1]:t}" == (screen|tmux|dvtm|ssh|mosh) ]]; then
-add-zsh-hook preexec set-titles-preexec
+      _terminal-set-terminal-app-proxy-icon ' '
+    fi
+	}
+	add-zsh-hook preexec _terminal-unset-terminal-app-proxy-icon
+
+  # Do not set the tab and window titles in Terminal.app since it sets the tab
+  # title to the currently running process by default and the current working
+  # directory is set separately.
+	return
+fi
+
+# Set up non-Apple terminals.
+if zstyle -t ':prezto:module:terminal' auto-title \
+  && ( ! [[ -n "$STY" || -n "$TMUX" ]] )
+then
+	# Sets the tab and window titles before the prompt is displayed.
+	add-zsh-hook precmd _terminal-set-titles-with-path
+
+	# Sets the tab and window titles before command execution.
+	add-zsh-hook preexec _terminal-set-titles-with-command
+fi
 

modules/utility/init.zsh

@@ -104,17 +104,13 @@ alias sl='ls'            # I often screw this up.
 # Mac OS X Everywhere
 if [[ "$OSTYPE" == darwin* ]]; then
   alias o='open'
-  alias get='curl --continue-at - --location --progress-bar --remote-name --remote-time'
 else
   alias o='xdg-open'
-  alias get='wget --continue --progress=bar --timestamping'
 
   if (( $+commands[xclip] )); then
     alias pbcopy='xclip -selection clipboard -in'
     alias pbpaste='xclip -selection clipboard -out'
-  fi
+  elif (( $+commands[xsel] )); then
-
-  if (( $+commands[xsel] )); then
     alias pbcopy='xsel --clipboard --input'
     alias pbpaste='xsel --clipboard --output'
   fi
@@ -123,6 +119,13 @@ fi
 alias pbc='pbcopy'
 alias pbp='pbpaste'
 
+# File Download
+if (( $+commands[curl] )); then
+  alias get='curl --continue-at - --location --progress-bar --remote-name --remote-time'
+elif (( $+commands[wget] )); then
+  alias get='wget --continue --progress=bar --timestamping'
+fi
+
 # Resource Usage
 alias df='df -kh'
 alias du='du -kh'

runcoms/README.md

@@ -48,7 +48,7 @@ zprofile and zlogin are not meant to be used concurrently but can be done so.
 This file is sourced by interactive shells. It should define aliases,
 functions, shell options, and key bindings.
 
-## zpreztorc
+### zpreztorc
 
 This file configures Prezto.
 

runcoms/zlogin

@@ -8,7 +8,7 @@
 # Execute code that does not affect the current session in the background.
 {
   # Compile the completion dump to increase startup speed.
-  zcompdump="$ZDOTDIR/.zcompdump"
+  zcompdump="${ZDOTDIR:-$HOME}/.zcompdump"
   if [[ -s "$zcompdump" && (! -s "${zcompdump}.zwc" || "$zcompdump" -nt "${zcompdump}.zwc") ]]; then
     zcompile "$zcompdump"
   fi

runcoms/zpreztorc

@@ -10,7 +10,7 @@
 #
 
 # Set case-sensitivity for completion, history lookup, etc.
-zstyle ':prezto:*:*' case-sensitive 'no'
+# zstyle ':prezto:*:*' case-sensitive 'yes'
 
 # Color output (auto set to 'no' on dumb terminals).
 zstyle ':prezto:*:*' color 'yes'
@@ -122,14 +122,19 @@ zstyle ':prezto:module:prompt' theme 'sorin'
 #   'builtin' 'bg=blue' \
 #   'command' 'bg=blue' \
 #   'function' 'bg=blue'
-#
 
 #
 # Terminal
 #
 
 # Auto set the tab and window titles.
-zstyle ':prezto:module:terminal' auto-title 'yes'
+# zstyle ':prezto:module:terminal' auto-title 'yes'
+
+# Set the window title format.
+# zstyle ':prezto:module:terminal:window-title' format '%n@%m: %s'
+
+# Set the tab title format.
+# zstyle ':prezto:module:terminal:tab-title' format '%m: %s'
 
 #
 # Tmux

runcoms/zprofile

@@ -5,3 +5,73 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
+#
+# Browser
+#
+
+if [[ "$OSTYPE" == darwin* ]]; then
+  export BROWSER='open'
+fi
+
+#
+# Editors
+#
+
+export EDITOR='nano'
+export VISUAL='nano'
+export PAGER='less'
+
+#
+# Language
+#
+
+if [[ -z "$LANG" ]]; then
+  export LANG='en_US.UTF-8'
+fi
+
+#
+# Paths
+#
+
+# Ensure path arrays do not contain duplicates.
+typeset -gU cdpath fpath mailpath path
+
+# Set the the list of directories that cd searches.
+# cdpath=(
+#   $cdpath
+# )
+
+# Set the list of directories that Zsh searches for programs.
+path=(
+  /usr/local/{bin,sbin}
+  $path
+)
+
+#
+# Less
+#
+
+# Set the default Less options.
+# Mouse-wheel scrolling has been disabled by -X (disable screen clearing).
+# Remove -X and -F (exit if the content fits on one screen) to enable it.
+export LESS='-F -g -i -M -R -S -w -X -z-4'
+
+# Set the Less input preprocessor.
+if (( $+commands[lesspipe.sh] )); then
+  export LESSOPEN='| /usr/bin/env lesspipe.sh %s 2>&-'
+fi
+
+#
+# Temporary Files
+#
+
+if [[ ! -d "$TMPDIR" ]]; then
+  export TMPDIR="/tmp/$USER"
+  mkdir -p -m 700 "$TMPDIR"
+fi
+
+TMPPREFIX="${TMPDIR%/}/zsh"
+if [[ ! -d "$TMPPREFIX" ]]; then
+  mkdir -p "$TMPPREFIX"
+fi
+

runcoms/zshenv

@@ -5,79 +5,8 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
-#
+# Ensure that a non-login, non-interactive shell has a defined environment.
-# Browser
+if [[ "$SHLVL" -eq 1 && ! -o LOGIN ]]; then
-#
+  source "${ZDOTDIR:-$HOME}/.zprofile"
-
-if [[ "$OSTYPE" == darwin* ]]; then
-  export BROWSER='open'
 fi
 
-#
-# Editors
-#
-
-export EDITOR='nano'
-export VISUAL='nano'
-export PAGER='less'
-
-#
-# Language
-#
-
-if [[ -z "$LANG" ]]; then
-  export LANG='en_US.UTF-8'
-fi
-
-#
-# Paths
-#
-
-typeset -gU cdpath fpath mailpath path
-
-# Set the the list of directories that cd searches.
-# cdpath=(
-#   $cdpath
-# )
-
-# Set the list of directories that Zsh searches for programs.
-path=(
-  /usr/local/{bin,sbin}
-  $path
-)
-
-#
-# Less
-#
-
-# Set the default Less options.
-# Mouse-wheel scrolling has been disabled by -X (disable screen clearing).
-# Remove -X and -F (exit if the content fits on one screen) to enable it.
-export LESS='-F -g -i -M -R -S -w -X -z-4'
-
-# Set the Less input preprocessor.
-if (( $+commands[lesspipe.sh] )); then
-  export LESSOPEN='| /usr/bin/env lesspipe.sh %s 2>&-'
-fi
-
-#
-# Temporary Files
-#
-
-if [[ ! -d "$TMPDIR" ]]; then
-  export TMPDIR="/tmp/$USER"
-  mkdir -p -m 700 "$TMPDIR"
-fi
-
-TMPPREFIX="${TMPDIR%/}/zsh"
-if [[ ! -d "$TMPPREFIX" ]]; then
-  mkdir -p "$TMPPREFIX"
-fi
-
-#
-# Zsh
-#
-
-ZDOTDIR="${ZDOTDIR:-$HOME}"
-PREZTO="$ZDOTDIR/.zprezto"
-

runcoms/zshrc

@@ -6,8 +6,8 @@
 #
 
 # Source Prezto.
-if [[ -s "$PREZTO/init.zsh" ]]; then
+if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then
-  source "$PREZTO/init.zsh"
+  source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh"
 fi
 
 # Customize to your needs...

tools/go.sh

@@ -0,0 +1,57 @@
+#!/bin/sh
+
+clear
+echo ""
+
+hash zsh 2>/dev/null || {
+  echo "\033[0;31mFailed : ZSH is missing\033[0m"
+  echo " ➥ Prezto does not work without ZSH. Install it first."
+  echo ""
+  exit
+}
+
+if [ -d ~/.zprezto ]
+then
+  echo "\033[0;33mYou already have prezto installed.\033[0m Upgrading..."
+  cd ~/.zprezto
+  # git pull && git submodule update --init --recursive
+  /usr/bin/env git add .
+  /usr/bin/env git commit --all --message "Commit changes before upgrade" --quiet
+  /usr/bin/env git pull --recurse-submodules
+  /usr/bin/env git submodule update
+  exit
+fi
+
+echo "\033[0;34mCloning prezto...\033[0m"
+hash git >/dev/null && /usr/bin/env git clone --recursive https://github.com/loranger/prezto.git "${ZDOTDIR:-$HOME}/.zprezto" >/dev/null 2>&1 || {
+  echo "\033[0;31mFailed : Git is not installed\033[0m"
+  os=`uname`
+  if [ "$os" == 'Linux' ]; then
+    url='http://git-scm.com/download/linux'
+  elif [ "$os" == 'Darwin' ]; then
+    url='http://brew.sh/'
+  else
+    url='http://git-scm.com/'
+  fi
+
+  echo " ➥ You should really take a look at $url"
+  exit
+}
+
+for file in $HOME/.zprezto/runcoms/z*
+do
+  rcfile=`basename $file`
+  if [ -f $HOME/.$rcfile ] || [ -h $HOME/.$rcfile ]
+  then
+    echo "\033[0;33mFound ~/.$rcfile file.\033[0m \033[0;32mMoved to ~/.$rcfile.old\033[0m";
+    mv $HOME/.$rcfile $HOME/.$rcfile.old;
+  fi
+  ln -s $file $HOME/.$rcfile
+done
+
+echo "\033[0;32mPrezto is ready\033[0m"
+
+echo "\033[0;34mNow set zsh as your default shell by typing :\033[0m"
+echo "chsh -s $(which zsh)"
+echo "\033[0;34mand start a new term.\033[0m"
+# https://raw2.github.com/loranger/prezto/master/go.sh

tools/install.zsh

@@ -0,0 +1,97 @@
+#!/bin/zsh
+
+script_name="${0:t}"
+script_version='1.0.0'
+cached_argv="${argv}"
+backup_dir="$HOME/.prezto-backup/$(date +'%Y-%m-%d-%H-%M-%S')"
+
+# Writes to standard error.
+function print-error {
+  print "${script_name}: ${@}" >&2
+}
+
+# Writes to standard output.
+function print-info {
+  print "${@}" >&1
+}
+
+# Writes version information to standard errror.
+function version {
+  print "${script_name} ${script_version}
+
+Copyright (c) 2013 Sorin Ionescu
+
+This program is free software. You may modify or distribute it
+under the terms of the MIT License." >&2
+}
+
+# Writes help to standard error.
+function help {
+  print "Usage: ${script_name} [‐option ...] archive [directory]
+
+Options:
+    -v, --version          Display version and copyright
+    -h, --help             Display this help
+
+Report bugs to <sorin.ionescu@gmail.com>." >&2
+}
+
+# Backs up existing files.
+function backup {
+  local from="$1"
+  local to="$2"
+
+  if [[ ! -e "$from" ]]; then
+    return
+  fi
+
+  mkdir -p "$to:h"
+  mv "$from" "$to"
+}
+
+# Parse switches.
+while [[ "${1}" == -* ]]; do
+    case "${1}" in
+        ( -v | --version )
+            version
+            exit 0
+        ;;
+        ( -h | --help )
+            help
+            exit 0
+        ;;
+        ( -- )
+            shift
+            break
+        ;;
+        ( -* )
+            print-error "invalid option: ${1}"
+            help
+            exit 0
+        ;;
+    esac
+done
+
+git clone --recursive https://github.com/sorin-ionescu/prezto.git "${ZDOTDIR:-$HOME}/.zprezto"
+setopt EXTENDED_GLOB
+for rcfile in "${ZDOTDIR:-$HOME}"/.zprezto/runcoms/^README.md(.N); do
+  ln -s "$rcfile" "${ZDOTDIR:-$HOME}/.${rcfile:t}"
+done
+chsh -s /bin/zsh
+
+is-true "$use_color" && printf "$FG[green]"
+printf '%s' \
+'________                  _____
+___  __ \___________________  /______
+__  /_/ /_  ___/  _ \__  /_  __/  __ \
+_  ____/_  /   /  __/_  /_/ /_ / /_/ /
+/_/     /_/    \___/_____/\__/ \____/
+'
+is-true "$use_color" && printf "$FG[cyan]"
+print
+print 'Prezto has been updated to the latest version.'
+print 'Follow me on GitHub at https://github.com/sorin-ionescu/prezto.'
+
+exec zsh
+
+

tools/uninstall.zsh

@@ -0,0 +1 @@
+#!/bin/zsh