From f749fc7d90a576ed684c113e5a91f709ad097503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjarki=20=C3=81g=C3=BAst=20Gu=C3=B0mundsson?= Date: Fri, 3 Aug 2012 15:29:01 +0000 Subject: [PATCH] Started renaming Oh My Zsh to Prezto --- README.md | 18 +++++++++--------- helper.zsh | 14 +++++++------- init.zsh | 2 +- modules/history-substring-search/README.md | 2 +- modules/history-substring-search/init.zsh | 2 +- modules/syntax-highlighting/README.md | 2 +- modules/syntax-highlighting/init.zsh | 2 +- templates/README.md | 2 +- templates/zshenv | 4 ++-- templates/zshrc | 8 ++++---- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index c9cd91b3..42b9a16a 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,24 @@ -Oh My Zsh -========= +Prezto +====== -OMZ is a configuration framework for [Zsh][1] that enriches the command line +Prezto is a configuration framework for [Zsh][1] that enriches the command line interface environment with sane defaults, aliases, functions, auto completion, and prompt themes. Installation ------------ -Oh My Zsh will work with any recent release of Zsh, but the minimum recommended +Prezto will work with any recent release of Zsh, but the minimum recommended version is 4.3.10. 1. Clone the repository: - git clone --recursive https://github.com/sorin-ionescu/oh-my-zsh.git ~/.oh-my-zsh + git clone --recursive https://github.com/sorin-ionescu/prezto.git ~/.prezto 2. Create a new Zsh configuration by copying the Zsh configuration file templates provided: - for rcfile in ~/.oh-my-zsh/templates/z{shenv,shrc,login,logout}; do + for rcfile in ~/.prezto/templates/z{shenv,shrc,login,logout}; do cp -f $rcfile ~/.$rcfile:t done @@ -49,14 +49,14 @@ directories end up at the tail of the array. ### Troubleshooting -If you are not able to find certain commands after switching to *Oh My Zsh*, +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. Usage ----- -Oh My Zsh has many features disabled by default. Read the source code and +Prezto has many features disabled by default. Read the source code and accompanying README files to learn of what is available. ### Modules @@ -83,7 +83,7 @@ how to use Git, follow this [tutorial][5] and bookmark this [reference][6]. ### Completions -Submit program completions to the [zsh-completions][7] project. The Oh My Zsh +Submit program completions to the [zsh-completions][7] project. The Prezto completions directory will be synchronized against it. Resources diff --git a/helper.zsh b/helper.zsh index 7c960b20..6004ab1b 100644 --- a/helper.zsh +++ b/helper.zsh @@ -30,7 +30,7 @@ function autoloadable { ( unfunction $1 ; autoload -U +X $1 ) &> /dev/null } -# Loads Oh My Zsh modules. +# Loads Prezto modules. function omodload { local -a omodules local omodule @@ -45,11 +45,11 @@ function omodload { setopt LOCAL_OPTIONS EXTENDED_GLOB # Add functions to fpath. - fpath=(${omodules:+${OMZ}/modules/${^omodules}/functions(/FN)} $fpath) + fpath=(${omodules:+${PREZTO}/modules/${^omodules}/functions(/FN)} $fpath) - # Load Oh My Zsh functions. + # Load Prezto functions. for ofunction in \ - $OMZ/modules/${^omodules}/functions/^([_.]*|prompt_*_setup|README*)(.N:t) + $PREZTO/modules/${^omodules}/functions/^([_.]*|prompt_*_setup|README*)(.N:t) do autoload -Uz "$ofunction" done @@ -58,12 +58,12 @@ function omodload { for omodule in "$omodules[@]"; do if zstyle -t ":omz:module:$omodule" loaded; then continue - elif [[ ! -d "$OMZ/modules/$omodule" ]]; then + elif [[ ! -d "$PREZTO/modules/$omodule" ]]; then print "$0: no such module: $omodule" >&2 continue else - if [[ -s "$OMZ/modules/$omodule/init.zsh" ]]; then - source "$OMZ/modules/$omodule/init.zsh" + if [[ -s "$PREZTO/modules/$omodule/init.zsh" ]]; then + source "$PREZTO/modules/$omodule/init.zsh" fi if (( $? == 0 )); then diff --git a/init.zsh b/init.zsh index 9b466450..e274bd5d 100644 --- a/init.zsh +++ b/init.zsh @@ -1,5 +1,5 @@ # -# Initializes Oh My Zsh. +# Initializes Prezto. # # Authors: # Robby Russell diff --git a/modules/history-substring-search/README.md b/modules/history-substring-search/README.md index b1ad60b8..6dea18b9 100644 --- a/modules/history-substring-search/README.md +++ b/modules/history-substring-search/README.md @@ -1,7 +1,7 @@ History Substring Search ======================== -Integrates [zsh-history-substring-search][1] into Oh My Zsh, which implements +Integrates [zsh-history-substring-search][1] into Prezto, which implements the [Fish shell][2]'s history search feature, where the user can type in any part of a previously entered command and press up and down to cycle through matching commands. diff --git a/modules/history-substring-search/init.zsh b/modules/history-substring-search/init.zsh index a0ff287f..ce48749b 100644 --- a/modules/history-substring-search/init.zsh +++ b/modules/history-substring-search/init.zsh @@ -1,5 +1,5 @@ # -# Integrates history-substring-search into Oh My Zsh. +# Integrates history-substring-search into Prezto. # # Authors: # Suraj N. Kurapati diff --git a/modules/syntax-highlighting/README.md b/modules/syntax-highlighting/README.md index 38dc28c8..021a5f67 100644 --- a/modules/syntax-highlighting/README.md +++ b/modules/syntax-highlighting/README.md @@ -1,7 +1,7 @@ Syntax Highlighting =================== -Integrates [zsh-syntax-highlighting][1] into Oh My Zsh. +Integrates [zsh-syntax-highlighting][1] into Prezto. This module should be loaded *second to last*, where last is the *prompt* module, unless used in conjuncture with the *history-substring-search* module diff --git a/modules/syntax-highlighting/init.zsh b/modules/syntax-highlighting/init.zsh index 88ec7b47..db68bb57 100644 --- a/modules/syntax-highlighting/init.zsh +++ b/modules/syntax-highlighting/init.zsh @@ -1,5 +1,5 @@ # -# Integrates zsh-syntax-highlighting into Oh My Zsh. +# Integrates zsh-syntax-highlighting into Prezto. # # Authors: # Sorin Ionescu diff --git a/templates/README.md b/templates/README.md index 2f26fc9d..11b005a8 100644 --- a/templates/README.md +++ b/templates/README.md @@ -45,7 +45,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. -This is the main Oh My Zsh configuration file. +This is the main Prezto configuration file. ### zlogin diff --git a/templates/zshenv b/templates/zshenv index af83ce06..774a54dd 100644 --- a/templates/zshenv +++ b/templates/zshenv @@ -5,8 +5,8 @@ # Sorin Ionescu # -# Set the path to Oh My Zsh. -export OMZ="$HOME/.oh-my-zsh" +# Set the path to Prezto. +export PREZTO="$HOME/.prezto" # Paths typeset -gU cdpath fpath mailpath manpath path diff --git a/templates/zshrc b/templates/zshrc index 641d0275..8342a242 100644 --- a/templates/zshrc +++ b/templates/zshrc @@ -1,5 +1,5 @@ # -# Sets Oh My Zsh options. +# Sets Prezto options. # # Authors: # Sorin Ionescu @@ -26,7 +26,7 @@ zstyle ':omz:module:terminal' auto-title 'yes' # Set the Zsh functions to load (man zshcontrib). # zstyle ':omz:load' zfunction 'zargs' 'zmv' -# Set the Oh My Zsh modules to load (browse modules). +# Set the Prezto modules to load (browse modules). # The order matters. zstyle ':omz:load' omodule \ 'environment' \ @@ -44,8 +44,8 @@ zstyle ':omz:load' omodule \ # Auto set to 'off' on dumb terminals. zstyle ':omz:module:prompt' theme 'sorin' -# This will make you shout: OH MY ZSHELL! -source "$OMZ/init.zsh" +# Hey Prezto! +source "$PREZTO/init.zsh" # Customize to your needs...