summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/coffee/_coffee71
-rw-r--r--plugins/git-hubflow/git-hubflow.plugin.zsh348
-rw-r--r--plugins/git/git.plugin.zsh3
-rw-r--r--plugins/per-directory-history/per-directory-history.plugin.zsh7
-rw-r--r--plugins/rails/rails.plugin.zsh1
-rw-r--r--plugins/rvm/_rvm147
-rw-r--r--plugins/rvm/rvm.plugin.zsh2
-rw-r--r--plugins/screen/screen.plugin.zsh2
-rw-r--r--plugins/svn/svn.plugin.zsh19
-rw-r--r--plugins/urltools/urltools.plugin.zsh4
-rw-r--r--plugins/vi-mode/vi-mode.plugin.zsh5
-rw-r--r--templates/zshrc.zsh-template3
-rw-r--r--themes/agnoster.zsh-theme6
-rw-r--r--themes/minimal.zsh-theme25
-rw-r--r--themes/tjkirch_mod.zsh-theme13
-rw-r--r--tools/check_for_upgrade.sh8
16 files changed, 489 insertions, 175 deletions
diff --git a/plugins/coffee/_coffee b/plugins/coffee/_coffee
new file mode 100644
index 000000000..5c8eb9a08
--- /dev/null
+++ b/plugins/coffee/_coffee
@@ -0,0 +1,71 @@
+#compdef coffee
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of the zsh-users nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL ZSH-USERS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+# Completion script for Coffee.js v0.6.11 (http://coffeejs.org)
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+# * Mario Fernandez (https://github.com/sirech)
+#
+# ------------------------------------------------------------------------------
+
+local curcontext="$curcontext" state line ret=1
+typeset -A opt_args
+
+_arguments -C \
+ '(- *)'{-h,--help}'[display this help message]' \
+ '(- *)'{-v,--version}'[display the version number]' \
+ '(-b --bare)'{-b,--bare}'[compile without a top-level function wrapper]' \
+ '(-e --eval)'{-e,--eval}'[pass a string from the command line as input]:Inline Script' \
+ '(-i --interactive)'{-i,--interactive}'[run an interactive CoffeeScript REPL]' \
+ '(-j --join)'{-j,--join}'[concatenate the source CoffeeScript before compiling]:Destination JS file:_files -g "*.js"' \
+ '(-l --lint)'{-l,--lint}'[pipe the compiled JavaScript through JavaScript Lint]' \
+ '(--nodejs)--nodejs[pass options directly to the "node" binary]' \
+ '(-c --compile)'{-c,--compile}'[compile to JavaScript and save as .js files]' \
+ '(-o --output)'{-o,--output}'[set the output directory for compiled JavaScript]:Output Directory:_files -/' \
+ '(-n -t -p)'{-n,--nodes}'[print out the parse tree that the parser produces]' \
+ '(-n -t -p)'{-p,--print}'[print out the compiled JavaScript]' \
+ '(-n -t -p)'{-t,--tokens}'[print out the tokens that the lexer/rewriter produce]' \
+ '(-r --require)'{-r,--require}'[require a library before executing your script]:library' \
+ '(-s --stdio)'{-s,--stdio}'[listen for and compile scripts over stdio]' \
+ '(-w --watch)'{-w,--watch}'[watch scripts for changes and rerun commands]' \
+ '*:script or directory:_files' && ret=0
+
+return ret
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/plugins/git-hubflow/git-hubflow.plugin.zsh b/plugins/git-hubflow/git-hubflow.plugin.zsh
new file mode 100644
index 000000000..a09f88391
--- /dev/null
+++ b/plugins/git-hubflow/git-hubflow.plugin.zsh
@@ -0,0 +1,348 @@
+#!zsh
+#
+# Installation
+# ------------
+#
+# To achieve git-hubflow completion nirvana:
+#
+# 0. Update your zsh's git-completion module to the newest verion.
+# From here. http://zsh.git.sourceforge.net/git/gitweb.cgi?p=zsh/zsh;a=blob_plain;f=Completion/Unix/Command/_git;hb=HEAD
+#
+# 1. Install this file. Either:
+#
+# a. Place it in your .zshrc:
+#
+# b. Or, copy it somewhere (e.g. ~/.git-hubflow-completion.zsh) and put the following line in
+# your .zshrc:
+#
+# source ~/.git-hubflow-completion.zsh
+#
+# c. Or, use this file as a oh-my-zsh plugin.
+#
+
+_git-hf ()
+{
+ local curcontext="$curcontext" state line
+ typeset -A opt_args
+
+ _arguments -C \
+ ':command:->command' \
+ '*::options:->options'
+
+ case $state in
+ (command)
+
+ local -a subcommands
+ subcommands=(
+ 'init:Initialize a new git repo with support for the branching model.'
+ 'feature:Manage your feature branches.'
+ 'release:Manage your release branches.'
+ 'hotfix:Manage your hotfix branches.'
+ 'support:Manage your support branches.'
+ 'update:Pull upstream changes down into your master and develop branches.'
+ 'version:Shows version information.'
+ )
+ _describe -t commands 'git hf' subcommands
+ ;;
+
+ (options)
+ case $line[1] in
+
+ (init)
+ _arguments \
+ -f'[Force setting of gitflow branches, even if already configured]'
+ ;;
+
+ (version)
+ ;;
+
+ (hotfix)
+ __git-hf-hotfix
+ ;;
+
+ (release)
+ __git-hf-release
+ ;;
+
+ (feature)
+ __git-hf-feature
+ ;;
+ esac
+ ;;
+ esac
+}
+
+__git-hf-release ()
+{
+ local curcontext="$curcontext" state line
+ typeset -A opt_args
+
+ _arguments -C \
+ ':command:->command' \
+ '*::options:->options'
+
+ case $state in
+ (command)
+
+ local -a subcommands
+ subcommands=(
+ 'start:Start a new release branch.'
+ 'finish:Finish a release branch.'
+ 'list:List all your release branches. (Alias to `git hf release`)'
+ 'cancel:Cancel release'
+ 'push:Push release to github'
+ 'pull:Pull release from github'
+ 'track:Track release'
+ )
+ _describe -t commands 'git hf release' subcommands
+ _arguments \
+ -v'[Verbose (more) output]'
+ ;;
+
+ (options)
+ case $line[1] in
+
+ (start)
+ _arguments \
+ -F'[Fetch from origin before performing finish]'\
+ ':version:__git_hf_version_list'
+ ;;
+
+ (finish)
+ _arguments \
+ -F'[Fetch from origin before performing finish]' \
+ -s'[Sign the release tag cryptographically]'\
+ -u'[Use the given GPG-key for the digital signature (implies -s)]'\
+ -m'[Use the given tag message]'\
+ -p'[Push to $ORIGIN after performing finish]'\
+ -k'[Keep branch after performing finish]'\
+ -n"[Don't tag this release]"\
+ ':version:__git_hf_version_list'
+ ;;
+
+ *)
+ _arguments \
+ -v'[Verbose (more) output]'
+ ;;
+ esac
+ ;;
+ esac
+}
+
+__git-hf-hotfix ()
+{
+ local curcontext="$curcontext" state line
+ typeset -A opt_args
+
+ _arguments -C \
+ ':command:->command' \
+ '*::options:->options'
+
+ case $state in
+ (command)
+
+ local -a subcommands
+ subcommands=(
+ 'start:Start a new hotfix branch.'
+ 'finish:Finish a hotfix branch.'
+ 'list:List all your hotfix branches. (Alias to `git hf hotfix`)'
+ 'publish:Publish the hotfix branch.'
+ 'track:Track the hotfix branch.'
+ 'pull:Pull the hotfix from github.'
+ 'push:Push the hotfix to github.'
+ 'cancel:Cancel the hotfix.'
+ )
+ _describe -t commands 'git hf hotfix' subcommands
+ _arguments \
+ -v'[Verbose (more) output]'
+ ;;
+
+ (options)
+ case $line[1] in
+
+ (start)
+ _arguments \
+ -F'[Fetch from origin before performing finish]'\
+ ':hotfix:__git_hf_version_list'\
+ ':branch-name:__git_branch_names'
+ ;;
+
+ (finish)
+ _arguments \
+ -F'[Fetch from origin before performing finish]' \
+ -s'[Sign the release tag cryptographically]'\
+ -u'[Use the given GPG-key for the digital signature (implies -s)]'\
+ -m'[Use the given tag message]'\
+ -p'[Push to $ORIGIN after performing finish]'\
+ -k'[Keep branch after performing finish]'\
+ -n"[Don't tag this release]"\
+ ':hotfix:__git_hf_hotfix_list'
+ ;;
+
+ *)
+ _arguments \
+ -v'[Verbose (more) output]'
+ ;;
+ esac
+ ;;
+ esac
+}
+
+__git-hf-feature ()
+{
+ local curcontext="$curcontext" state line
+ typeset -A opt_args
+
+ _arguments -C \
+ ':command:->command' \
+ '*::options:->options'
+
+ case $state in
+ (command)
+
+ local -a subcommands
+ subcommands=(
+ 'list:List all your feature branches. (Alias to `git hf feature`)'
+ 'start:Start a new feature branch'
+ 'finish:Finish a feature branch'
+ 'submit:submit'
+ 'track:track'
+ 'diff:Diff'
+ 'rebase:Rebase feature branch against develop'
+ 'checkout:Checkout feature'
+ 'pull:Pull feature branch from github'
+ 'push:Push feature branch to github'
+ 'cancel:Cancel feature'
+ )
+ _describe -t commands 'git hf feature' subcommands
+ _arguments \
+ -v'[Verbose (more) output]'
+ ;;
+
+ (options)
+ case $line[1] in
+
+ (start)
+ _arguments \
+ -F'[Fetch from origin before performing finish]'\
+ ':feature:__git_hf_feature_list'\
+ ':branch-name:__git_branch_names'
+ ;;
+
+ (finish)
+ _arguments \
+ -F'[Fetch from origin before performing finish]' \
+ -r'[Rebase instead of merge]'\
+ ':feature:__git_hf_feature_list'
+ ;;
+
+ (publish)
+ _arguments \
+ ':feature:__git_hf_feature_list'\
+ ;;
+
+ (track)
+ _arguments \
+ ':feature:__git_hf_feature_list'\
+ ;;
+
+ (diff)
+ _arguments \
+ ':branch:__git_branch_names'\
+ ;;
+
+ (rebase)
+ _arguments \
+ -i'[Do an interactive rebase]' \
+ ':branch:__git_branch_names'
+ ;;
+
+ (checkout)
+ _arguments \
+ ':branch:__git_hf_feature_list'\
+ ;;
+
+ (pull)
+ _arguments \
+ ':remote:__git_remotes'\
+ ':branch:__git_branch_names'
+ ;;
+
+ *)
+ _arguments \
+ -v'[Verbose (more) output]'
+ ;;
+ esac
+ ;;
+ esac
+}
+
+__git_hf_version_list ()
+{
+ local expl
+ declare -a versions
+
+ versions=(${${(f)"$(_call_program versions git hf release list 2> /dev/null | tr -d ' |*')"}})
+ __git_command_successful || return
+
+ _wanted versions expl 'version' compadd $versions
+}
+
+__git_hf_feature_list ()
+{
+ local expl
+ declare -a features
+
+ features=(${${(f)"$(_call_program features git hf feature list 2> /dev/null | tr -d ' |*')"}})
+ __git_command_successful || return
+
+ _wanted features expl 'feature' compadd $features
+}
+
+__git_remotes () {
+ local expl gitdir remotes
+
+ gitdir=$(_call_program gitdir git rev-parse --git-dir 2>/dev/null)
+ __git_command_successful || return
+
+ remotes=(${${(f)"$(_call_program remotes git config --get-regexp '"^remote\..*\.url$"')"}//#(#b)remote.(*).url */$match[1]})
+ __git_command_successful || return
+
+ # TODO: Should combine the two instead of either or.
+ if (( $#remotes > 0 )); then
+ _wanted remotes expl remote compadd $* - $remotes
+ else
+ _wanted remotes expl remote _files $* - -W "($gitdir/remotes)" -g "$gitdir/remotes/*"
+ fi
+}
+
+__git_hf_hotfix_list ()
+{
+ local expl
+ declare -a hotfixes
+
+ hotfixes=(${${(f)"$(_call_program hotfixes git hf hotfix list 2> /dev/null | tr -d ' |*')"}})
+ __git_command_successful || return
+
+ _wanted hotfixes expl 'hotfix' compadd $hotfixes
+}
+
+__git_branch_names () {
+ local expl
+ declare -a branch_names
+
+ branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads 2>/dev/null)"}#refs/heads/})
+ __git_command_successful || return
+
+ _wanted branch-names expl branch-name compadd $* - $branch_names
+}
+
+__git_command_successful () {
+ if (( ${#pipestatus:#0} > 0 )); then
+ _message 'not a git repository'
+ return 1
+ fi
+ return 0
+}
+
+zstyle ':completion:*:*:git:*' user-commands flow:'description for foo'
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 71388c53a..14ae78d41 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -5,7 +5,7 @@ alias gst='git status'
compdef _git gst=git-status
alias gl='git pull'
compdef _git gl=git-pull
-alias gup='git fetch && git rebase'
+alias gup='git pull --rebase'
compdef _git gup=git-fetch
alias gp='git push'
compdef _git gp=git-push
@@ -38,6 +38,7 @@ alias gm='git merge'
compdef _git gm=git-merge
alias grh='git reset HEAD'
alias grhh='git reset HEAD --hard'
+alias gwc='git whatchanged -p --abbrev-commit --pretty=medium'
# Will cd into the top of the current repository
# or submodule.
diff --git a/plugins/per-directory-history/per-directory-history.plugin.zsh b/plugins/per-directory-history/per-directory-history.plugin.zsh
index 22383b8b9..61e8b5a62 100644
--- a/plugins/per-directory-history/per-directory-history.plugin.zsh
+++ b/plugins/per-directory-history/per-directory-history.plugin.zsh
@@ -65,12 +65,13 @@
function per-directory-history-toggle-history() {
if [[ $_per_directory_history_is_global == true ]]; then
_per-directory-history-set-directory-history
- echo "using local history\n"
+ print "\nusing local history\n"
else
_per-directory-history-set-global-history
- echo "using global history\n"
+ print "\nusing global history\n"
fi
- zle reset-prompt
+ zle .push-line
+ zle .accept-line
}
autoload per-directory-history-toggle-history
diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index 4aa7a05d6..cd232a6ae 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -5,6 +5,7 @@ alias sp='ruby script/plugin'
alias sr='ruby script/runner'
alias ssp='ruby script/spec'
alias rdbm='rake db:migrate'
+alias rdbtp='rake db:test:prepare'
alias sc='ruby script/console'
alias sd='ruby script/server --debugger'
alias devlog='tail -f log/development.log'
diff --git a/plugins/rvm/_rvm b/plugins/rvm/_rvm
deleted file mode 100644
index bba5304a0..000000000
--- a/plugins/rvm/_rvm
+++ /dev/null
@@ -1,147 +0,0 @@
-#compdef rvm
-
-local curcontext="$curcontext" state line cmds ret=1
-
-_arguments -C \
- '(- 1 *)'{-v,--version}'[display version information]' \
- '(-l|--level)'{-l,--level}'+[patch level to use with rvm use / install]:number' \
- '(--prefix)--prefix[path for all rvm files (~/.rvm/), with trailing slash!]:path:_files' \
- '(--bin)--bin[path for binaries to be placed (~/.rvm/bin/)]:path:_files' \
- '(--source)--source[src directory to use (~/.rvm/src/)]:path:_files' \
- '(--archives)--archives[directory for downladed files (~/.rvm/archives/)]:path:_files' \
- '-S[Specify a script file to attempt to load and run (rubydo)]:file:_files' \
- '-e[Execute code from the command line]:code' \
- '(-G)-G[root gem path to use]:path:_files' \
- '(--gems)--gems[Used to set the gems_flag, use with remove to remove gems]' \
- '(--archive)--archive[Used to set the archive_flag, use with remove to remove archive]' \
- '(--patch)--patch[With MRI Rubies you may specify one or more full paths to patches]' \
- '(-C|--configure)'{-C,--configure}'=[custom configure options]' \
- '(--nice)--nice[process niceness (for slow computers, default 0)]:number' \
- '(--ree)--ree-options[Options passed directly to ree ./installer on the command line]:options' \
- '(--head)--head[with update, updates rvm to git head version]' \
- '(--rubygems)--rubygems[with update, updates rubygems for selected ruby]' \
- '(--default)--default[with ruby select, sets a default ruby for new shells]' \
- '(--debug)--debug[Toggle debug mode on for very verbose output]' \
- '(--trace)--trace[Toggle trace mode on to see EVERYTHING rvm is doing]' \
- '(--force)--force[Force install, removes old install & source before install]' \
- '(--summary)--summary[Used with rubydo to print out a summary of the commands run]' \
- '(--latest)--latest[with gemset --dump skips version strings for latest gem]' \
- '(--gems)--gems[with uninstall/remove removes gems with the interpreter]' \
- '(--docs)--docs[with install, attempt to generate ri after installation]' \
- '(--reconfigure)--reconfigure[Force ./configure on install even if Makefile already exists]' \
- '1: :->cmds' \
- '*: :->args' && ret=0
-
-case $state in
- cmds)
- cmds=(
- "version:show the rvm version installed in rvm_path"
- "use:setup current shell to use a specific ruby version"
- "reload:reload rvm source itself (useful after changing rvm source)"
- "implode:(seppuku) removes the rvm installation completely. This means everything in $rvm_path (~/.rvm)."
- "update:upgrades rvm to the latest version."
- "reset:remove current and stored default & system settings."
- "info :show the *current* environment information for current ruby"
- "current:print the *current* ruby version and the name of any gemset being used."
- "debug:show info plus additional information for common issues"
- "install:install one or many ruby versions"
- "uninstall:uninstall one or many ruby versions, leaves their sources"
- "remove:uninstall one or many ruby versions and remove their sources"
- "migrate:Lets you migrate all gemsets from one ruby to another."
- "upgrade:Lets you upgrade from one version of a ruby to another, including migrating your gemsets semi-automatically."
- "wrapper:generates a set of wrapper executables for a given ruby with the specified ruby and gemset combination. Used under the hood for passenger support and the like."
- "cleanup:Lets you remove stale source folders / archives and other miscellaneous data associated with rvm."
- "repair:Lets you repair parts of your environment e.g. wrappers, env files and and similar files (e.g. general maintenance)."
- "snapshot:Lets your backup / restore an rvm installation in a lightweight manner."
- "disk-usage:Tells you how much disk space rvm install is using."
- "tools:Provides general information about the ruby environment, primarily useful when scripting rvm."
- "docs:Tools to make installing ri and rdoc documentation easier."
- "rvmrc:Tools related to managing rvmrc trust and loading."
- "exec:runs an arbitrary command as a set operation."
- "ruby:runs a named ruby file against specified and/or all rubies"
- "gem:runs a gem command using selected ruby's 'gem'"
- "rake:runs a rake task against specified and/or all rubies"
- "tests:runs 'rake test' across selected ruby versions"
- "specs:runs 'rake spec' across selected ruby versions"
- "monitor:Monitor cwd for testing, run rake {spec,test} on changes."
- "gemset:gemsets: http://rvm.beginrescueend.com/gemsets/"
- "rubygems:Switches the installed version of rubygems for the current ruby."
- "gemdir:display the path to the current gem directory (GEM_HOME)."
- "srcdir:display the path to rvm source directory (may be yanked)"
- "fetch:Performs an archive / src fetch only of the selected ruby."
- "list:show currently installed rubies, interactive output."
- "package:Install a dependency package {readline,iconv,zlib,openssl}"
- "notes:Display notes, with operating system specifics."
- "export:Temporarily set an environment variable in the current shell."
- "unexport:Undo changes made to the environment by 'rvm export'."
- )
- _describe -t commands 'rvm command' cmds && ret=0
- ;;
- args)
- case $line[1] in
- (use|uninstall|remove|list)
- _values -S , 'rubies' $(rvm list strings | sed -e 's/ruby-\([^) ]*\)-\([^) ]*\)/ruby-\1-\2 \1-\2 \1/g') default system && ret=0
- ;;
- (install|fetch)
- _values -S , 'rubies' $(rvm list known_strings) && ret=0
- ;;
- gemset)
- if (( CURRENT == 3 )); then
- _values 'gemset_commands' \
- 'import' \
- 'export' \
- 'create' \
- 'copy' \
- 'rename' \
- 'empty' \
- 'delete' \
- 'name' \
- 'dir' \
- 'list' \
- 'list_all' \
- 'gemdir' \
- 'install' \
- 'pristine' \
- 'clear' \
- 'use' \
- 'update' \
- 'unpack' \
- 'globalcache'
- else
- _values -S , 'gemsets' $(rvm gemset list | grep -v gemset 2>/dev/null)
- fi
- ret=0
- ;;
- package)
- if (( CURRENT == 3 )); then
- _values 'package_commands' \
- 'install' \
- 'uninstall'
- else
- _values 'packages' \
- 'readline' \
- 'iconv' \
- 'curl' \
- 'openssl' \
- 'zlib' \
- 'autoconf' \
- 'ncurses' \
- 'pkgconfig' \
- 'gettext' \
- 'glib' \
- 'mono' \
- 'llvm' \
- 'libxml2' \
- 'libxslt' \
- 'libyaml'
- fi
- ret=0
- ;;
- *)
- (( ret )) && _message 'no more arguments'
- ;;
- esac
- ;;
-esac
-
-return ret
diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 604c00713..27f29f2b3 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -1,3 +1,5 @@
+fpath=($rvm_path/scripts/zsh/Completion $fpath)
+
alias rubies='rvm list rubies'
alias gemsets='rvm gemset list'
diff --git a/plugins/screen/screen.plugin.zsh b/plugins/screen/screen.plugin.zsh
index 98178e807..7009e7a91 100644
--- a/plugins/screen/screen.plugin.zsh
+++ b/plugins/screen/screen.plugin.zsh
@@ -1,6 +1,6 @@
# if using GNU screen, let the zsh tell screen what the title and hardstatus
# of the tab window should be.
-if [[ $TERM == "screen" ]]; then
+if [[ "$TERM" == screen* ]]; then
if [[ $_GET_PATH == '' ]]; then
_GET_PATH='echo $PWD | sed "s/^\/Users\//~/;s/^\/home\//~/;s/^~$USER/~/"'
fi
diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index 79c8bdcdf..e38e8920b 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -1,8 +1,15 @@
function svn_prompt_info {
if [ $(in_svn) ]; then
+ if [ "x$SVN_SHOW_BRANCH" = "xtrue" ]; then
+ unset SVN_SHOW_BRANCH
+ _DISPLAY=$(svn_get_branch_name)
+ else
+ _DISPLAY=$(svn_get_repo_name)
+ fi
echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
-$ZSH_THEME_REPO_NAME_COLOR$(svn_get_repo_name)$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$ZSH_PROMPT_BASE_COLOR"
+$ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$ZSH_PROMPT_BASE_COLOR"
+ unset _DISPLAY
fi
}
@@ -21,6 +28,16 @@ function svn_get_repo_name {
fi
}
+function svn_get_branch_name {
+ _DISPLAY=$(svn info 2> /dev/null | awk -F/ '/^URL:/ { for (i=0; i<=NF; i++) { if ($i == "branches" || $i == "tags" ) { print $(i+1); break }; if ($i == "trunk") { print $i; break } } }')
+ if [ "x$_DISPLAY" = "x" ]; then
+ svn_get_repo_name
+ else
+ echo $_DISPLAY
+ fi
+ unset _DISPLAY
+}
+
function svn_get_rev_nr {
if [ $(in_svn) ]; then
svn info 2> /dev/null | sed -n s/Revision:\ //p
diff --git a/plugins/urltools/urltools.plugin.zsh b/plugins/urltools/urltools.plugin.zsh
index 0d29314d6..3de74ae3d 100644
--- a/plugins/urltools/urltools.plugin.zsh
+++ b/plugins/urltools/urltools.plugin.zsh
@@ -4,6 +4,6 @@
# Taken from:
# http://ruslanspivak.com/2010/06/02/urlencode-and-urldecode-from-a-command-line/
-alias urlencode='python -c "import sys, urllib as ul; print ul.quote_plus(sys.argv[1])"'
+alias urlencode='node -e "console.log(encodeURIComponent(process.argv[1]))"'
-alias urldecode='python -c "import sys, urllib as ul; print ul.unquote_plus(sys.argv[1])"' \ No newline at end of file
+alias urldecode='node -e "console.log(decodeURIComponent(process.argv[1]))"'
diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index d29eb1dda..c47ab7211 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -5,12 +5,7 @@ function zle-line-init zle-keymap-select {
zle -N zle-line-init
zle -N zle-keymap-select
-#changing mode clobbers the keybinds, so store the keybinds before and execute
-#them after
-binds=`bindkey -L`
bindkey -v
-for bind in ${(@f)binds}; do eval $bind; done
-unset binds
# if mode indicator wasn't setup by theme, define default
if [[ "$MODE_INDICATOR" == "" ]]; then
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index e52553241..758fc26b8 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -17,6 +17,9 @@ ZSH_THEME="robbyrussell"
# Comment this out to disable weekly auto-update checks
# DISABLE_AUTO_UPDATE="true"
+# Change this value to set how frequently ZSH updates¬
+export UPDATE_ZSH_DAYS=13
+
# Uncomment following line if you want to disable colors in ls
# DISABLE_LS_COLORS="true"
diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 84b9649a6..bd6f1a6a2 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -73,7 +73,7 @@ prompt_git() {
if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
ZSH_THEME_GIT_PROMPT_DIRTY='±'
dirty=$(parse_git_dirty)
- ref=$(git symbolic-Fref HEAD 2> /dev/null) || ref="➦ $(git show-ref --head -s --abbrev |head -n1 2> /dev/null)"
+ ref=$(git symbolic-ref HEAD 2> /dev/null) || ref="➦ $(git show-ref --head -s --abbrev |head -n1 2> /dev/null)"
if [[ -n $dirty ]]; then
prompt_segment yellow black
else
@@ -106,10 +106,10 @@ prompt_status() {
build_prompt() {
RETVAL=$?
prompt_status
- prompt_contextx
+ prompt_context
prompt_dir
prompt_git
prompt_end
}
-PROMPT='%{%f%b%k%}$(build_prompt) ' \ No newline at end of file
+PROMPT='%{%f%b%k%}$(build_prompt) '
diff --git a/themes/minimal.zsh-theme b/themes/minimal.zsh-theme
index ee3ab6b22..a2a16031f 100644
--- a/themes/minimal.zsh-theme
+++ b/themes/minimal.zsh-theme
@@ -1,15 +1,18 @@
ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[white]%}["
-ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}●%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_CLEAN=""
+ZSH_THEME_GIT_PROMPT_SUFFIX=""
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}●%{$reset_color%}]%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_CLEAN="]%{$reset_color%} "
+ZSH_THEME_SVN_PROMPT_PREFIX=$ZSH_THEME_GIT_PROMPT_PREFIX
+ZSH_THEME_SVN_PROMPT_SUFFIX=$ZSH_THEME_GIT_PROMPT_SUFFIX
+ZSH_THEME_SVN_PROMPT_DIRTY=$ZSH_THEME_GIT_PROMPT_DIRTY
+ZSH_THEME_SVN_PROMPT_CLEAN=$ZSH_THEME_GIT_PROMPT_CLEAN
-#Customized git status, oh-my-zsh currently does not allow render dirty status before branch
-git_custom_status() {
- local cb=$(current_branch)
- if [ -n "$cb" ]; then
- echo "- $ZSH_THEME_GIT_PROMPT_PREFIX$(current_branch)$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
- fi
+vcs_status() {
+ if [[ ( $(whence in_svn) != "" ) && ( $(in_svn) == 1 ) ]]; then
+ svn_prompt_info
+ else
+ git_prompt_info
+ fi
}
-
-PROMPT='%2~ $(git_custom_status) »%b ' \ No newline at end of file
+PROMPT='%2~ $(vcs_status)»%b ' \ No newline at end of file
diff --git a/themes/tjkirch_mod.zsh-theme b/themes/tjkirch_mod.zsh-theme
new file mode 100644
index 000000000..1b206a7e1
--- /dev/null
+++ b/themes/tjkirch_mod.zsh-theme
@@ -0,0 +1,13 @@
+ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[green]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}⚡"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+function prompt_char {
+ if [ $UID -eq 0 ]; then echo "%{$fg[red]%}#%{$reset_color%}"; else echo $; fi
+}
+
+PROMPT='%(?,,%{$fg[red]%}FAIL: $?%{$reset_color%}
+)%{$fg[magenta]%}%n%{$reset_color%}@%{$fg[yellow]%}%m%{$reset_color%}: %{$fg_bold[blue]%}%~%{$reset_color%}$(git_prompt_info) %_$(prompt_char) '
+
+RPROMPT='%{$fg[green]%}[%*]%{$reset_color%}'
diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 612901cbe..581f03a07 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -14,6 +14,12 @@ function _upgrade_zsh() {
_update_zsh_update
}
+epoch_target=$UPDATE_ZSH_DAYS
+if [[ -z "$epoch_target" ]]; then
+ # Default to old behavior
+ epoch_target=13
+fi
+
if [ -f ~/.zsh-update ]
then
. ~/.zsh-update
@@ -23,7 +29,7 @@ then
fi
epoch_diff=$(($(_current_epoch) - $LAST_EPOCH))
- if [ $epoch_diff -gt 13 ]
+ if [ $epoch_diff -gt $epoch_target ]
then
if [ "$DISABLE_UPDATE_PROMPT" = "true" ]
then
generated by cgit v1.2.3-70-g09d2 (git 2.48.1) at 2025-02-05 14:55:24 +0000