mj / zsh-config

Commit 61aaa7b58bf9508cb738a8b0c30610e994d443ac

Authored by mj 2016-01-13 02:32:15 +0100

Squashed 'repos/robbyrussell/oh-my-zsh/' changes from ee34381..686e460

686e460 Merge branch 'sachin21-a_happy_new_year'
03cc1f7 Cleanup LICENSE file and fix README link
fdde897 Update year to 2016
f558a46 Merge pull request #4709 from mcornella/fix-local-vars-in-git-prompt
0842384 Put `local var` declaration in its own line in lib/git.zsh
30ddf25 Merge pull request #4695 from mcornella/add-hub-completion
69c73a4 Merge pull request #4704 from paulcalabro/patch-1
247a582 Fixed a typo.
5adb06d Merge pull request #4702 from prikhi/master
3ebbb40 colored-man-pages: Use Portable `less` Path
6ad6d11 Merge pull request #4700 from giordanovi/master
015437c Update gulp.plugin.zsh
3162de5 Add hub's completion file
4b95c16 Merge branch 'fix-colored-man-pages-syntax'
5e310c5 Fix syntax error in colored-man-pages
fe9ff63 Merge pull request #4463 from giordanovi/master
4f314e2 Update gulp.plugin.zsh
8042394 Update gulp.plugin.zsh
cb11d13 Merge pull request #4697 from psprint/master
d30a501 znt: more optimizing workarounds for 5.0.6 <= zsh < 5.2
5de1704 Merge branch 'cknoblauch-patch-1'
09d2a59 Fix style of colored-man-pages plugin
a815729 colored-man plugin: Quoted PATH variable
dd29954 Merge branch 'hallabro-consistent-wording-update'
18ca953 Use consistent wording when updating
ef31d06 Merge pull request #4139 from ultimatemonty/patch-1
8a3b78e Merge pull request #4536 from alexws54tk/patch-1
e344f4c Merge pull request #4420 from apjanke/git-move-current_branch-to-core
9f55213 Move current_branch() from git plugin to core lib/git.zsh
bfd2d8d Merge pull request #4498 from gfvcastro/alias-rake-stats
8d6fcce Merge pull request #4589 from apjanke/agnoster-powerline-char-stronger-warning
93c00cc Merge pull request #4451 from victor-torres/branch-plugin
d988ee0 Merge pull request #4568 from blueyed/archlinux-improve-commands-lookup
fe63ed0 Updating speed test info and using zsh command line.
cf5db83 Implementing mcornella's suggestions in pull request 4451.
531789e Merge pull request #4628 from moyamo/master
bd384a0 Merge pull request #4667 from dbohdan/patch-1
b15918d "fishy" theme: Fix "~" use in prompt
71deb74 Fix indentation
d779750 Default to using terminfo to set the terminal title
6a8692d Merge pull request #4676 from bamarni/composer-stderr
4108c48 Merge pull request #4690 from kaelig/patch-1
6190d3e Point to the GitHub repository
f564159 Merge branch 'GNUletik-master'
95aa9bd Better research history with arrow keys
273063a Merge pull request #4663 from psprint/master
d54d896 Merge pull request #3966 from apjanke/fix-spectrum-ls
4d154ab Merge branch 'apjanke-histsubstr-double-bind'
45822e8 history-substring-search: bind arrows in both emacs and viins modes
11de60f Merge pull request #3965 from apjanke/spectrum-hide-codes
4fbfb14 Add back the `-` alias to go to the previous directory
b6997f6 Update link to git completion
5e950d4 Merge pull request #4689 from apjanke/fix-non-numeric-versions
45e42ef Merge pull request #4657 from hghwng/master
07fcbbe Merge pull request #4641 from WeeBull/patch-1
c52f677 common-aliases: handle "dev" versions in version check
0cca3c0 Merge pull request #4687 from gmccue/web-search-ecosia
fb5effd Add Ecosia to web-search plugin.
357d57c znt: include some status information on top of the window
0d45e77 [Composer] redirect stderr to /dev/null for completion commands
c793bae znt: optimize heap usage for older Zsh's (e.g. 5.0.8)
2e3731c "fishy" theme: Shorten path .foo to .f, not .
89205f9 znt: faster startup of tools using colorifying (e.g. n-history)
a42a3ee Recognize Firefox addon and Android packages.
b57ddd6 Use actual `commit --amend` command for Mercurial
cc116f6 agnoster: stronger warning about changing SEGMENT_SEPARATOR character
9e4aba4 archlinux: use $+commands instead of 'command -v' in a subshell
67abf0f Update frontcube.zsh-theme
e5164d7 Add 'rake stats' alias.
ee8f377 Added support to subtask through gulp --tasks-simple command
d49cacf Add branch plugin
e6ccd37 Merge master (rebase being super annoying). Fix conflicts
30ef856 Fix maintainer line
3594e27 Nicer formatting
0bda651 Fix the spectrum_ls implementation in spectrum.zsh
8142261 Hide spectrum.zsh var values to avoid junky "set" output to terminal

git-subtree-dir: repos/robbyrussell/oh-my-zsh
git-subtree-split: 686e46025890cba38d2cb7ad7cc229bf6beeba57

Showing 39 changed files with 429 additions and 178 deletions Inline Diff

MIT-LICENSE.txt
README.markdown
lib/directories.zsh
lib/git.zsh
lib/key-bindings.zsh
lib/spectrum.zsh
lib/termsupport.zsh
plugins/archlinux/archlinux.plugin.zsh
plugins/branch/README.md
plugins/branch/branch.plugin.zsh
plugins/colored-man-pages/colored-man-pages.plugin.zsh
plugins/common-aliases/common-aliases.plugin.zsh
plugins/composer/composer.plugin.zsh
plugins/ember-cli/README.md
plugins/extract/extract.plugin.zsh
plugins/git-extras/git-extras.plugin.zsh
plugins/git-flow/git-flow.plugin.zsh
plugins/git/git.plugin.zsh
plugins/github/_hub
plugins/gulp/gulp.plugin.zsh
plugins/history-substring-search/history-substring-search.plugin.zsh
plugins/history-substring-search/update-from-upstream.zsh
plugins/mercurial/mercurial.plugin.zsh
plugins/rails/rails.plugin.zsh
plugins/web-search/web-search.plugin.zsh
plugins/zsh-navigation-tools/README.md
plugins/zsh-navigation-tools/n-list
plugins/zsh-navigation-tools/n-panelize
themes/agnoster.zsh-theme
themes/eastwood.zsh-theme
themes/fishy.zsh-theme
themes/frontcube.zsh-theme
themes/gallois.zsh-theme
themes/josh.zsh-theme
themes/juanghurtado.zsh-theme
themes/mortalscumbag.zsh-theme
themes/peepcode.zsh-theme
themes/sunrise.zsh-theme
tools/upgrade.sh

MIT-LICENSE.txt

Diff comments View file @ 61aaa7b

README.markdown

Diff comments View file @ 61aaa7b

1	![Oh My Zsh](https://s3.amazonaws.com/ohmyzsh/oh-my-zsh-logo.png)	1	![Oh My Zsh](https://s3.amazonaws.com/ohmyzsh/oh-my-zsh-logo.png)
2		2
3		3
4	Oh My Zsh is an open source, community-driven framework for managing your [zsh](http://www.zsh.org/) configuration. That sounds boring. Let's try this again.	4	Oh My Zsh is an open source, community-driven framework for managing your [zsh](http://www.zsh.org/) configuration. That sounds boring. Let's try this again.
5		5
6	__Oh My Zsh is a way of life!__ Once installed, your terminal prompt will become the talk of the town _or your money back!_ Each time you interact with your command prompt, you'll be able to take advantage of the hundreds of bundled plugins and pretty themes. Strangers will come up to you in cafés and ask you, _"that is amazing. are you some sort of genius?"_ Finally, you'll begin to get the sort of attention that you always felt that you deserved. ...or maybe you'll just use the time that you saved to start flossing more often.	6	__Oh My Zsh is a way of life!__ Once installed, your terminal prompt will become the talk of the town _or your money back!_ Each time you interact with your command prompt, you'll be able to take advantage of the hundreds of bundled plugins and pretty themes. Strangers will come up to you in cafés and ask you, _"that is amazing. are you some sort of genius?"_ Finally, you'll begin to get the sort of attention that you always felt that you deserved. ...or maybe you'll just use the time that you saved to start flossing more often.
7		7
8	To learn more, visit [ohmyz.sh](http://ohmyz.sh) and/or follow [ohmyzsh](https://twitter.com/ohmyzsh) on Twitter.	8	To learn more, visit [ohmyz.sh](http://ohmyz.sh) and/or follow [ohmyzsh](https://twitter.com/ohmyzsh) on Twitter.
9		9
10	## Getting Started	10	## Getting Started
11		11
12		12
13	### Prerequisites	13	### Prerequisites
14		14
15	__Disclaimer:__ _Oh My Zsh works best on Mac OS X and Linux._	15	__Disclaimer:__ _Oh My Zsh works best on Mac OS X and Linux._
16		16
17	* Unix-based operating system (Mac OS X or Linux)	17	* Unix-based operating system (Mac OS X or Linux)
18	* [Zsh](http://www.zsh.org) should be installed (v4.3.9 or more recent). If not pre-installed (`zsh --version` to confirm), check the following instruction here: [Installing-ZSH](https://github.com/robbyrussell/oh-my-zsh/wiki/Installing-ZSH)	18	* [Zsh](http://www.zsh.org) should be installed (v4.3.9 or more recent). If not pre-installed (`zsh --version` to confirm), check the following instruction here: [Installing-ZSH](https://github.com/robbyrussell/oh-my-zsh/wiki/Installing-ZSH)
19	* `curl` or `wget` should be installed	19	* `curl` or `wget` should be installed
20	* `git` should be installed	20	* `git` should be installed
21		21
22	### Basic Installation	22	### Basic Installation
23		23
24	Oh My Zsh is installed by running one of the following commands in your terminal. You can install this via the command-line with either `curl` or `wget`.	24	Oh My Zsh is installed by running one of the following commands in your terminal. You can install this via the command-line with either `curl` or `wget`.
25		25
26	#### via curl	26	#### via curl
27		27
28	```shell	28	```shell
29	sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"	29	sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
30	```	30	```
31		31
32	#### via wget	32	#### via wget
33		33
34	```shell	34	```shell
35	sh -c "$(wget https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O -)"	35	sh -c "$(wget https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O -)"
36	```	36	```
37		37
38	## Using Oh My Zsh	38	## Using Oh My Zsh
39		39
40	### Plugins	40	### Plugins
41		41
42	Oh My Zsh comes with a shit load of plugins to take advantage of. You can take a look in the [plugins](https://github.com/robbyrussell/oh-my-zsh/tree/master/plugins) directory and/or the [wiki](https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins) to see what's currently available.	42	Oh My Zsh comes with a shit load of plugins to take advantage of. You can take a look in the [plugins](https://github.com/robbyrussell/oh-my-zsh/tree/master/plugins) directory and/or the [wiki](https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins) to see what's currently available.
43		43
44	#### Enabling Plugins	44	#### Enabling Plugins
45		45
46	If you spot a plugin (or several) that you would like to use with Oh My Zsh, you will need to edit the `~/.zshrc` file. Once you open it with your favorite editor, you'll see a spot to list all the plugins that you'd like Oh My Zsh to load in initialization.	46	If you spot a plugin (or several) that you would like to use with Oh My Zsh, you will need to edit the `~/.zshrc` file. Once you open it with your favorite editor, you'll see a spot to list all the plugins that you'd like Oh My Zsh to load in initialization.
47		47
48	For example, this line might begin to look like...	48	For example, this line might begin to look like...
49		49
50	```shell	50	```shell
51	plugins=(git bundler osx rake ruby)	51	plugins=(git bundler osx rake ruby)
52	```	52	```
53		53
54	#### Using Plugins	54	#### Using Plugins
55		55
56	Most plugins (should! we're working on this) include a __README__, which documents how to use them.	56	Most plugins (should! we're working on this) include a __README__, which documents how to use them.
57		57
58	### Themes	58	### Themes
59		59
60	We'll admit it. Early in the Oh My Zsh world, we may have gotten a bit too theme happy. We have over one hundred themes now bundled. Most of them have [screenshots](https://wiki.github.com/robbyrussell/oh-my-zsh/themes) on the wiki. Check them out!	60	We'll admit it. Early in the Oh My Zsh world, we may have gotten a bit too theme happy. We have over one hundred themes now bundled. Most of them have [screenshots](https://wiki.github.com/robbyrussell/oh-my-zsh/themes) on the wiki. Check them out!
61		61
62	#### Selecting a Theme	62	#### Selecting a Theme
63		63
64	_Robby's theme is the default one. It's not the fanciest one. It's not the simplest one. It's just right (for him)._	64	_Robby's theme is the default one. It's not the fanciest one. It's not the simplest one. It's just right (for him)._
65		65
66	Once you find a theme that you want to use, you will need to edit the `~/.zshrc` file. You'll see an environment variable (all caps) in there that looks like:	66	Once you find a theme that you want to use, you will need to edit the `~/.zshrc` file. You'll see an environment variable (all caps) in there that looks like:
67		67
68	```shell	68	```shell
69	ZSH_THEME="robbyrussell"	69	ZSH_THEME="robbyrussell"
70	```	70	```
71		71
72	To use a different theme, simply change the value to match the name of your desired theme. For example:	72	To use a different theme, simply change the value to match the name of your desired theme. For example:
73		73
74	```shell	74	```shell
75	ZSH_THEME="agnoster" # (this is one of the fancy ones)	75	ZSH_THEME="agnoster" # (this is one of the fancy ones)
76	```	76	```
77		77
78	Open up a new terminal window and your prompt should look something like...	78	Open up a new terminal window and your prompt should look something like...
79		79
80	![Agnoster theme](https://cloud.githubusercontent.com/assets/2618447/6316862/70f58fb6-ba03-11e4-82c9-c083bf9a6574.png)	80	![Agnoster theme](https://cloud.githubusercontent.com/assets/2618447/6316862/70f58fb6-ba03-11e4-82c9-c083bf9a6574.png)
81		81
82	In case you did not find a suitable theme for your needs, please have a look at the wiki for [more of them](https://github.com/robbyrussell/oh-my-zsh/wiki/External-themes).	82	In case you did not find a suitable theme for your needs, please have a look at the wiki for [more of them](https://github.com/robbyrussell/oh-my-zsh/wiki/External-themes).
83		83
84	If you're feeling feisty, you can let the computer select one randomly for you each time you open a new terminal window.	84	If you're feeling feisty, you can let the computer select one randomly for you each time you open a new terminal window.
85		85
86		86
87	```shell	87	```shell
88	ZSH_THEME="random" # (...please let it be pie... please be some pie..)	88	ZSH_THEME="random" # (...please let it be pie... please be some pie..)
89	```	89	```
90		90
91		91
92	## Advanced Topics	92	## Advanced Topics
93		93
94	If you're the type that likes to get their hands dirty, these sections might resonate.	94	If you're the type that likes to get their hands dirty, these sections might resonate.
95		95
96	### Advanced Installation	96	### Advanced Installation
97		97
98	Some users may want to change the default path, or manually install Oh My Zsh.	98	Some users may want to change the default path, or manually install Oh My Zsh.
99		99
100	#### Custom Directory	100	#### Custom Directory
101		101
102	The default location is `~/.oh-my-zsh` (hidden in your home directory)	102	The default location is `~/.oh-my-zsh` (hidden in your home directory)
103		103
104	If you'd like to change the install directory with the `ZSH` environment variable, either by running `export ZSH=/your/path` before installing, or by setting it before the end of the install pipeline like this:	104	If you'd like to change the install directory with the `ZSH` environment variable, either by running `export ZSH=/your/path` before installing, or by setting it before the end of the install pipeline like this:
105		105
106	```shell	106	```shell
107	export ZSH="$HOME/.dotfiles/oh-my-zsh"; sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"	107	export ZSH="$HOME/.dotfiles/oh-my-zsh"; sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
108	```	108	```
109		109
110	#### Manual Installation	110	#### Manual Installation
111		111
112	##### 1. Clone the repository:	112	##### 1. Clone the repository:
113		113
114	```shell	114	```shell
115	git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh	115	git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh
116	```	116	```
117		117
118	##### 2. Optionally, backup your existing `~/.zshrc` file:	118	##### 2. Optionally, backup your existing `~/.zshrc` file:
119		119
120	```shell	120	```shell
121	cp ~/.zshrc ~/.zshrc.orig	121	cp ~/.zshrc ~/.zshrc.orig
122	```	122	```
123		123
124	##### 3. Create a new zsh configuration file	124	##### 3. Create a new zsh configuration file
125		125
126	You can create a new zsh config file by copying the template that we included for you.	126	You can create a new zsh config file by copying the template that we included for you.
127		127
128	```shell	128	```shell
129	cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc	129	cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
130	```	130	```
131		131
132	##### 4. Change your default shell	132	##### 4. Change your default shell
133		133
134	```shell	134	```shell
135	chsh -s /bin/zsh	135	chsh -s /bin/zsh
136	```	136	```
137		137
138	##### 5. Initialize your new zsh configuration	138	##### 5. Initialize your new zsh configuration
139		139
140	Once you open up a new terminal window, it should load zsh with Oh My Zsh's configuration.	140	Once you open up a new terminal window, it should load zsh with Oh My Zsh's configuration.
141		141
142	### Installation Problems	142	### Installation Problems
143		143
144	If you have any hiccups installing, here are a few common fixes.	144	If you have any hiccups installing, here are a few common fixes.
145		145
146	* You _might_ need to modify your `PATH` in `~/.zshrc` if you're not able to find some commands after switching to `oh-my-zsh`.	146	* You _might_ need to modify your `PATH` in `~/.zshrc` if you're not able to find some commands after switching to `oh-my-zsh`.
147	* If you installed manually or changed the install location, check the `ZSH` environment variable in `~/.zshrc`.	147	* If you installed manually or changed the install location, check the `ZSH` environment variable in `~/.zshrc`.
148		148
149	### Custom Plugins and Themes	149	### Custom Plugins and Themes
150		150
151	If you want to override any of the default behaviors, just add a new file (ending in `.zsh`) in the `custom/` directory.	151	If you want to override any of the default behaviors, just add a new file (ending in `.zsh`) in the `custom/` directory.
152		152
153	If you have many functions that go well together, you can put them as a `XYZ.plugin.zsh` file in the `custom/plugins/` directory and then enable this plugin.	153	If you have many functions that go well together, you can put them as a `XYZ.plugin.zsh` file in the `custom/plugins/` directory and then enable this plugin.
154		154
155	If you would like to override the functionality of a plugin distributed with Oh My Zsh, create a plugin of the same name in the `custom/plugins/` directory and it will be loaded instead of the one in `plugins/`.	155	If you would like to override the functionality of a plugin distributed with Oh My Zsh, create a plugin of the same name in the `custom/plugins/` directory and it will be loaded instead of the one in `plugins/`.
156		156
157	## Getting Updates	157	## Getting Updates
158		158
159	By default, you will be prompted to check for upgrades every few weeks. If you would like `oh-my-zsh` to automatically upgrade itself without prompting you, set the following in your `~/.zshrc`:	159	By default, you will be prompted to check for upgrades every few weeks. If you would like `oh-my-zsh` to automatically upgrade itself without prompting you, set the following in your `~/.zshrc`:
160		160
161	```shell	161	```shell
162	DISABLE_UPDATE_PROMPT=true	162	DISABLE_UPDATE_PROMPT=true
163	```	163	```
164		164
165	To disable automatic upgrades, set the following in your `~/.zshrc`:	165	To disable automatic upgrades, set the following in your `~/.zshrc`:
166		166
167	```shell	167	```shell
168	DISABLE_AUTO_UPDATE=true	168	DISABLE_AUTO_UPDATE=true
169	```	169	```
170		170
171	### Manual Updates	171	### Manual Updates
172		172
173	If you'd like to upgrade at any point in time (maybe someone just released a new plugin and you don't want to wait a week?) you just need to run:	173	If you'd like to upgrade at any point in time (maybe someone just released a new plugin and you don't want to wait a week?) you just need to run:
174		174
175	```shell	175	```shell
176	upgrade_oh_my_zsh	176	upgrade_oh_my_zsh
177	```	177	```
178		178
179	Magic!	179	Magic!
180		180
181	## Uninstalling Oh My Zsh	181	## Uninstalling Oh My Zsh
182		182
183	Oh My Zsh isn't for everyone. We'll miss you, but we want to make this an easy breakup.	183	Oh My Zsh isn't for everyone. We'll miss you, but we want to make this an easy breakup.
184		184
185	If you want to uninstall `oh-my-zsh`, just run `uninstall_oh_my_zsh` from the command-line. It will remove itself and revert your previous `bash` or `zsh` configuration.	185	If you want to uninstall `oh-my-zsh`, just run `uninstall_oh_my_zsh` from the command-line. It will remove itself and revert your previous `bash` or `zsh` configuration.
186		186
187	## Contributing	187	## Contributing
188		188
189	I'm far from being a [Zsh](http://www.zsh.org/) expert and suspect there are many ways to improve – if you have ideas on how to make the configuration easier to maintain (and faster), don't hesitate to fork and send pull requests!	189	I'm far from being a [Zsh](http://www.zsh.org/) expert and suspect there are many ways to improve – if you have ideas on how to make the configuration easier to maintain (and faster), don't hesitate to fork and send pull requests!
190		190
191	We also need people to test out pull-requests. So take a look through [the open issues](https://github.com/robbyrussell/oh-my-zsh/issues) and help where you can.	191	We also need people to test out pull-requests. So take a look through [the open issues](https://github.com/robbyrussell/oh-my-zsh/issues) and help where you can.
192		192
193	### Do NOT send us themes	193	### Do NOT send us themes
194		194
195	We have (more than) enough themes for the time being. Please add your theme to the [external themes](https://github.com/robbyrussell/oh-my-zsh/wiki/External-themes) wiki page.	195	We have (more than) enough themes for the time being. Please add your theme to the [external themes](https://github.com/robbyrussell/oh-my-zsh/wiki/External-themes) wiki page.
196		196
197	## Contributors	197	## Contributors
198		198
199	Oh My Zsh has a vibrant community of happy users and delightful contributors. Without all the time and help from our contributors, it wouldn't be so awesome.	199	Oh My Zsh has a vibrant community of happy users and delightful contributors. Without all the time and help from our contributors, it wouldn't be so awesome.
200		200
201	Thank you so much!	201	Thank you so much!
202		202
203	## Follow Us	203	## Follow Us
204		204
205	We have an [@ohmyzsh](https://twitter.com/ohmyzsh) Twitter account. You should follow it.	205	We have an [@ohmyzsh](https://twitter.com/ohmyzsh) Twitter account. You should follow it.
206		206
207	## Merchandise	207	## Merchandise
208		208
209	We have [stickers](http://shop.planetargon.com/products/ohmyzsh-stickers-set-of-3-stickers) and [shirts](http://shop.planetargon.com/products/ohmyzsh-t-shirts) for you to show off your love of Oh My Zsh. Again, this will help you become the talk of the town!	209	We have [stickers](http://shop.planetargon.com/products/ohmyzsh-stickers-set-of-3-stickers) and [shirts](http://shop.planetargon.com/products/ohmyzsh-t-shirts) for you to show off your love of Oh My Zsh. Again, this will help you become the talk of the town!
210		210
211	## License	211	## License
212		212
213	Oh My Zsh is released under the [MIT license](https://github.com/robbyrussell/oh-my-zsh/blob/master/MIT-LICENSE.txt).	213	Oh My Zsh is released under the [MIT license](MIT-LICENSE.txt).
214		214

lib/directories.zsh

Diff comments View file @ 61aaa7b

 # Changing/making/removing directory
 setopt auto_pushd
 setopt pushd_ignore_dups
 setopt pushdminus
 alias -g ...='../..'
 alias -g ....='../../..'
 alias -g .....='../../../..'
 alias -g ......='../../../../..'
+alias -- -='cd -'
 alias 1='cd -'
 alias 2='cd -2'
 alias 3='cd -3'
 alias 4='cd -4'
 alias 5='cd -5'
 alias 6='cd -6'
 alias 7='cd -7'
 alias 8='cd -8'
 alias 9='cd -9'
 alias md='mkdir -p'
 alias rd=rmdir
 alias d='dirs -v | head -10'
 # List directory contents
 alias lsa='ls -lah'
 alias l='ls -lah'
 alias ll='ls -lh'
 alias la='ls -lAh'
 # Push and pop directories on directory stack
 alias pu='pushd'
 alias po='popd'

lib/git.zsh

Diff comments View file @ 61aaa7b

-# get the name of the branch we are on
+# Outputs current branch info in prompt format
 function git_prompt_info() {
+  local ref
   if [[ "$(command git config --get oh-my-zsh.hide-status 2>/dev/null)" != "1" ]]; then
     ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
     ref=$(command git rev-parse --short HEAD 2> /dev/null) || return 0
     echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
   fi
 }
 # Checks if working tree is dirty
-parse_git_dirty() {
+function parse_git_dirty() {
   local STATUS=''
   local FLAGS
   FLAGS=('--porcelain')
   if [[ "$(command git config --get oh-my-zsh.hide-dirty)" != "1" ]]; then
     if [[ $POST_1_7_2_GIT -gt 0 ]]; then
       FLAGS+='--ignore-submodules=dirty'
     fi
     if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" == "true" ]]; then
       FLAGS+='--untracked-files=no'
     fi
     STATUS=$(command git status ${FLAGS} 2> /dev/null | tail -n1)
   fi
   if [[ -n $STATUS ]]; then
     echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
   else
     echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
   fi
 }
-# get the difference between the local and remote branches
+# Gets the difference between the local and remote branches
-git_remote_status() {
+function git_remote_status() {
+    local remote ahead behind git_remote_status git_remote_status_detailed
     remote=${$(command git rev-parse --verify ${hook_com[branch]}@{upstream} --symbolic-full-name 2>/dev/null)/refs\/remotes\/}
-    if [[ -n ${remote} ]] ; then
+    if [[ -n ${remote} ]]; then
         ahead=$(command git rev-list ${hook_com[branch]}@{upstream}..HEAD 2>/dev/null | wc -l)
         behind=$(command git rev-list HEAD..${hook_com[branch]}@{upstream} 2>/dev/null | wc -l)
-        if [ $ahead -eq 0 ] && [ $behind -eq 0 ]
+        if [[ $ahead -gt 0 ]] && [[ $behind -eq 0 ]]; then
-        then
-          	git_remote_status="$ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE"
-        elif [ $ahead -gt 0 ] && [ $behind -eq 0 ]
-        then
             git_remote_status="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE"
             git_remote_status_detailed="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE$((ahead))%{$reset_color%}"
-        elif [ $behind -gt 0 ] && [ $ahead -eq 0 ]
+        elif [[ $behind -gt 0 ]] && [[ $ahead -eq 0 ]]; then
-        then
             git_remote_status="$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE"
             git_remote_status_detailed="$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE$((behind))%{$reset_color%}"
-        elif [ $ahead -gt 0 ] && [ $behind -gt 0 ]
+        elif [[ $ahead -gt 0 ]] && [[ $behind -gt 0 ]]; then
-        then
             git_remote_status="$ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE"
             git_remote_status_detailed="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE$((ahead))%{$reset_color%}$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE$((behind))%{$reset_color%}"
         fi
-        if [ $ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_DETAILED ]
+        if [[ -n $ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_DETAILED ]]; then
-        then
             git_remote_status="$ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_PREFIX$remote$git_remote_status_detailed$ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_SUFFIX"
         fi
         echo $git_remote_status
     fi
 }
+# Outputs the name of the current branch
+# Usage example: git pull origin $(git_current_branch)
+# Using '--quiet' with 'symbolic-ref' will not cause a fatal error (128) if
+# it's not a symbolic ref, but in a Git repo.
+function git_current_branch() {
+  local ref
+  ref=$(command git symbolic-ref --quiet HEAD 2> /dev/null)
+  local ret=$?
+  if [[ $ret != 0 ]]; then
+    [[ $ret == 128 ]] && return  # no git repo.
+    ref=$(command git rev-parse --short HEAD 2> /dev/null) || return
+  fi
+  echo ${ref#refs/heads/}
+}
 # Gets the number of commits ahead from remote
 function git_commits_ahead() {
   if $(echo "$(command git log @{upstream}..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then
+    local COMMITS
     COMMITS=$(command git log @{upstream}..HEAD | grep '^commit' | wc -l | tr -d ' ')
     echo "$ZSH_THEME_GIT_COMMITS_AHEAD_PREFIX$COMMITS$ZSH_THEME_GIT_COMMITS_AHEAD_SUFFIX"
   fi
 }
 # Outputs if current branch is ahead of remote
 function git_prompt_ahead() {
-  if [[ -n "$(command git rev-list origin/$(current_branch)..HEAD 2> /dev/null)" ]]; then
+  if [[ -n "$(command git rev-list origin/$(git_current_branch)..HEAD 2> /dev/null)" ]]; then
     echo "$ZSH_THEME_GIT_PROMPT_AHEAD"
   fi
 }
 # Outputs if current branch is behind remote
 function git_prompt_behind() {
-  if [[ -n "$(command git rev-list HEAD..origin/$(current_branch) 2> /dev/null)" ]]; then
+  if [[ -n "$(command git rev-list HEAD..origin/$(git_current_branch) 2> /dev/null)" ]]; then
     echo "$ZSH_THEME_GIT_PROMPT_BEHIND"
   fi
 }
 # Outputs if current branch exists on remote or not
 function git_prompt_remote() {
-  if [[ -n "$(command git show-ref origin/$(current_branch) 2> /dev/null)" ]]; then
+  if [[ -n "$(command git show-ref origin/$(git_current_branch) 2> /dev/null)" ]]; then
     echo "$ZSH_THEME_GIT_PROMPT_REMOTE_EXISTS"
   else
     echo "$ZSH_THEME_GIT_PROMPT_REMOTE_MISSING"
   fi
 }
 # Formats prompt string for current git commit short SHA
 function git_prompt_short_sha() {
+  local SHA
   SHA=$(command git rev-parse --short HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER"
 }
 # Formats prompt string for current git commit long SHA
 function git_prompt_long_sha() {
+  local SHA
   SHA=$(command git rev-parse HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER"
 }
 # Get the status of the working tree
-git_prompt_status() {
+function git_prompt_status() {
+  local INDEX STATUS
   INDEX=$(command git status --porcelain -b 2> /dev/null)
   STATUS=""
   if $(echo "$INDEX" | command grep -E '^\?\? ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
   fi
   if $(echo "$INDEX" | grep '^A  ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
   elif $(echo "$INDEX" | grep '^M  ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
   fi
   if $(echo "$INDEX" | grep '^ M ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
   elif $(echo "$INDEX" | grep '^AM ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
   elif $(echo "$INDEX" | grep '^ T ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
   fi
   if $(echo "$INDEX" | grep '^R  ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS"
   fi
   if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
   elif $(echo "$INDEX" | grep '^D  ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
   elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
   fi
   if $(command git rev-parse --verify refs/stash >/dev/null 2>&1); then
     STATUS="$ZSH_THEME_GIT_PROMPT_STASHED$STATUS"
   fi
   if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
   fi
   if $(echo "$INDEX" | grep '^## .*ahead' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_AHEAD$STATUS"
   fi
   if $(echo "$INDEX" | grep '^## .*behind' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_BEHIND$STATUS"
   fi
   if $(echo "$INDEX" | grep '^## .*diverged' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_DIVERGED$STATUS"
   fi
   echo $STATUS
 }
-#compare the provided version of git to the version installed and on path
+# Compares the provided version of git to the version installed and on path
-#prints 1 if input version <= installed version
+# Outputs -1, 0, or 1 if the installed version is less than, equal to, or
-#prints -1 otherwise
+# greater than the input version, respectively.
 function git_compare_version() {
-  local INPUT_GIT_VERSION=$1;
+  local INPUT_GIT_VERSION INSTALLED_GIT_VERSION
-  local INSTALLED_GIT_VERSION
+  INPUT_GIT_VERSION=(${(s/./)1})
-  INPUT_GIT_VERSION=(${(s/./)INPUT_GIT_VERSION});
+  INSTALLED_GIT_VERSION=($(command git --version 2>/dev/null))
-  INSTALLED_GIT_VERSION=($(command git --version 2>/dev/null));
+  INSTALLED_GIT_VERSION=(${(s/./)INSTALLED_GIT_VERSION[3]})
-  INSTALLED_GIT_VERSION=(${(s/./)INSTALLED_GIT_VERSION[3]});
   for i in {1..3}; do
     if [[ $INSTALLED_GIT_VERSION[$i] -gt $INPUT_GIT_VERSION[$i] ]]; then
       echo 1
       return 0
     fi
     if [[ $INSTALLED_GIT_VERSION[$i] -lt $INPUT_GIT_VERSION[$i] ]]; then
       echo -1
       return 0
     fi

lib/key-bindings.zsh

Diff comments View file @ 61aaa7b

 # http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html
 # http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Zle-Builtins
 # http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Standard-Widgets
 # Make sure that the terminal is in application mode when zle is active, since
 # only then values from $terminfo are valid
 if (( ${+terminfo[smkx]} )) && (( ${+terminfo[rmkx]} )); then
   function zle-line-init() {
     echoti smkx
   }
   function zle-line-finish() {
     echoti rmkx
   }
   zle -N zle-line-init
   zle -N zle-line-finish
 fi
 bindkey -e                                            # Use emacs key bindings
 bindkey '\ew' kill-region                             # [Esc-w] - Kill from the cursor to the mark
 bindkey -s '\el' 'ls\n'                               # [Esc-l] - run command: ls
 bindkey '^r' history-incremental-search-backward      # [Ctrl-r] - Search backward incrementally for a specified string. The string may begin with ^ to anchor the search to the beginning of the line.
 if [[ "${terminfo[kpp]}" != "" ]]; then
   bindkey "${terminfo[kpp]}" up-line-or-history       # [PageUp] - Up a line of history
 fi
 if [[ "${terminfo[knp]}" != "" ]]; then
   bindkey "${terminfo[knp]}" down-line-or-history     # [PageDown] - Down a line of history
 fi
+# start typing + [Up-Arrow] - fuzzy find history forward
 if [[ "${terminfo[kcuu1]}" != "" ]]; then
-  bindkey "${terminfo[kcuu1]}" up-line-or-search      # start typing + [Up-Arrow] - fuzzy find history forward
+  autoload -U up-line-or-beginning-search
+  zle -N up-line-or-beginning-search
+  bindkey "${terminfo[kcuu1]}" up-line-or-beginning-search
 fi
+# start typing + [Down-Arrow] - fuzzy find history backward
 if [[ "${terminfo[kcud1]}" != "" ]]; then
-  bindkey "${terminfo[kcud1]}" down-line-or-search    # start typing + [Down-Arrow] - fuzzy find history backward
+  autoload -U down-line-or-beginning-search
+  zle -N down-line-or-beginning-search
+  bindkey "${terminfo[kcud1]}" down-line-or-beginning-search
 fi
 if [[ "${terminfo[khome]}" != "" ]]; then
   bindkey "${terminfo[khome]}" beginning-of-line      # [Home] - Go to beginning of line
 fi
 if [[ "${terminfo[kend]}" != "" ]]; then
   bindkey "${terminfo[kend]}"  end-of-line            # [End] - Go to end of line
 fi
 bindkey ' ' magic-space                               # [Space] - do history expansion
 bindkey '^[[1;5C' forward-word                        # [Ctrl-RightArrow] - move forward one word
 bindkey '^[[1;5D' backward-word                       # [Ctrl-LeftArrow] - move backward one word
 if [[ "${terminfo[kcbt]}" != "" ]]; then
   bindkey "${terminfo[kcbt]}" reverse-menu-complete   # [Shift-Tab] - move through the completion menu backwards
 fi
 bindkey '^?' backward-delete-char                     # [Backspace] - delete backward
 if [[ "${terminfo[kdch1]}" != "" ]]; then
   bindkey "${terminfo[kdch1]}" delete-char            # [Delete] - delete forward
 else
   bindkey "^[[3~" delete-char
   bindkey "^[3;5~" delete-char
   bindkey "\e[3~" delete-char
 fi
 # Edit the current command line in $EDITOR
 autoload -U edit-command-line
 zle -N edit-command-line
 bindkey '\C-x\C-e' edit-command-line
 # file rename magick
 bindkey "^[m" copy-prev-shell-word
 # consider emacs keybindings:
 #bindkey -e  ## emacs key bindings
 #
 #bindkey '^[[A' up-line-or-search
 #bindkey '^[[B' down-line-or-search
 #bindkey '^[^[[C' emacs-forward-word
 #bindkey '^[^[[D' emacs-backward-word
 #
 #bindkey -s '^X^Z' '%-^M'
 #bindkey '^[e' expand-cmd-path
 #bindkey '^[^I' reverse-menu-complete
 #bindkey '^X^N' accept-and-infer-next-history
 #bindkey '^W' kill-region
 #bindkey '^I' complete-word
 ## Fix weird sequence that rxvt produces
 #bindkey -s '^[[Z' '\t'
 #

lib/spectrum.zsh

Diff comments View file @ 61aaa7b

1	#! /bin/zsh	1	#! /bin/zsh
2	# A script to make using 256 colors in zsh less painful.	2	# A script to make using 256 colors in zsh less painful.
3	# P.C. Shyamshankar <sykora@lucentbeing.com>	3	# P.C. Shyamshankar <sykora@lucentbeing.com>
4	# Copied from http://github.com/sykora/etc/blob/master/zsh/functions/spectrum/	4	# Copied from http://github.com/sykora/etc/blob/master/zsh/functions/spectrum/
5		5
6	typeset -Ag FX FG BG	6	typeset -AHg FX FG BG
7		7
8	FX=(	8	FX=(
9	reset "%{[00m%}"	9	reset "%{[00m%}"
10	bold "%{[01m%}" no-bold "%{[22m%}"	10	bold "%{[01m%}" no-bold "%{[22m%}"
11	italic "%{[03m%}" no-italic "%{[23m%}"	11	italic "%{[03m%}" no-italic "%{[23m%}"
12	underline "%{[04m%}" no-underline "%{[24m%}"	12	underline "%{[04m%}" no-underline "%{[24m%}"
13	blink "%{[05m%}" no-blink "%{[25m%}"	13	blink "%{[05m%}" no-blink "%{[25m%}"
14	reverse "%{[07m%}" no-reverse "%{[27m%}"	14	reverse "%{[07m%}" no-reverse "%{[27m%}"
15	)	15	)
16		16
17	for color in {000..255}; do	17	for color in {000..255}; do
18	FG[$color]="%{[38;5;${color}m%}"	18	FG[$color]="%{[38;5;${color}m%}"
19	BG[$color]="%{[48;5;${color}m%}"	19	BG[$color]="%{[48;5;${color}m%}"
20	done	20	done
21		21
22		22
23	ZSH_SPECTRUM_TEXT=${ZSH_SPECTRUM_TEXT:-Arma virumque cano Troiae qui primus ab oris}	23	ZSH_SPECTRUM_TEXT=${ZSH_SPECTRUM_TEXT:-Arma virumque cano Troiae qui primus ab oris}
24		24
25	# Show all 256 colors with color number	25	# Show all 256 colors with color number
26	function spectrum_ls() {	26	function spectrum_ls() {
27	for code in {000..255}; do	27	for code in {000..255}; do
28	print -P -- "$code: %F{$code}$ZSH_SPECTRUM_TEXT%f"	28	print -P -- "$code: %{$FG[$code]%}$ZSH_SPECTRUM_TEXT%{$reset_color%}"
29	done	29	done
30	}	30	}
31		31
32	# Show all 256 colors where the background is set to specific color	32	# Show all 256 colors where the background is set to specific color
33	function spectrum_bls() {	33	function spectrum_bls() {
34	for code in {000..255}; do	34	for code in {000..255}; do
35	print -P -- "$BG[$code]$code: $ZSH_SPECTRUM_TEXT %{$reset_color%}"	35	print -P -- "$code: %{$BG[$code]%}$ZSH_SPECTRUM_TEXT%{$reset_color%}"
36	done	36	done
37	}	37	}
38		38

lib/termsupport.zsh

Diff comments View file @ 61aaa7b

 # Set terminal window and tab/icon title
 #
 # usage: title short_tab_title [long_window_title]
 #
 # See: http://www.faqs.org/docs/Linux-mini/Xterm-Title.html#ss3.1
 # Fully supports screen, iterm, and probably most modern xterm and rxvt
 # (In screen, only short_tab_title is used)
 # Limited support for Apple Terminal (Terminal can't set window and tab separately)
 function title {
   emulate -L zsh
   setopt prompt_subst
   [[ "$EMACS" == *term* ]] && return
   # if $2 is unset use $1 as default
   # if it is set and empty, leave it as is
   : ${2=$1}
   case "$TERM" in
     cygwin|xterm*|putty*|rxvt*|ansi)
       print -Pn "\e]2;$2:q\a" # set window name
       print -Pn "\e]1;$1:q\a" # set tab name
       ;;
     screen*)
       print -Pn "\ek$1:q\e\\" # set screen hardstatus
       ;;
     *)
       if [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
         print -Pn "\e]2;$2:q\a" # set window name
         print -Pn "\e]1;$1:q\a" # set tab name
+      else
+        # Try to use terminfo to set the title
+        # If the feature is available set title
+        if [[ -n "$terminfo[fsl]" ]] && [[ -n "$terminfo[tsl]" ]]; then
+	  echoti tsl
+	  print -Pn "$1"
+	  echoti fsl
+	fi
       fi
       ;;
   esac
 }
 ZSH_THEME_TERM_TAB_TITLE_IDLE="%15<..<%~%<<" #15 char left truncated PWD
 ZSH_THEME_TERM_TITLE_IDLE="%n@%m: %~"
 # Avoid duplication of directory in terminals with independent dir display
 if [[ "$TERM_PROGRAM" == Apple_Terminal ]]; then
   ZSH_THEME_TERM_TITLE_IDLE="%n@%m"
 fi
 # Runs before showing the prompt
 function omz_termsupport_precmd {
   emulate -L zsh
   if [[ "$DISABLE_AUTO_TITLE" == true ]]; then
     return
   fi
   title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE
 }
 # Runs before executing the command
 function omz_termsupport_preexec {
   emulate -L zsh
   setopt extended_glob
   if [[ "$DISABLE_AUTO_TITLE" == true ]]; then
     return
   fi
   # cmd name only, or if this is sudo or ssh, the next cmd
   local CMD=${1[(wr)^(*=*|sudo|ssh|mosh|rake|-*)]:gs/%/%%}
   local LINE="${2:gs/%/%%}"
   title '$CMD' '%100>...>$LINE%<<'
 }
 precmd_functions+=(omz_termsupport_precmd)
 preexec_functions+=(omz_termsupport_preexec)
 # Keep Apple Terminal.app's current working directory updated
 # Based on this answer: http://superuser.com/a/315029
 # With extra fixes to handle multibyte chars and non-UTF-8 locales
 if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]] && [[ -z "$INSIDE_EMACS" ]]; then
   # Emits the control sequence to notify Terminal.app of the cwd
   # Identifies the directory using a file: URI scheme, including
   # the host name to disambiguate local vs. remote paths.
   function update_terminalapp_cwd() {
     emulate -L zsh
     # Percent-encode the pathname.
     local URL_PATH="$(omz_urlencode -P $PWD)"
     [[ $? != 0 ]] && return 1
     # Undocumented Terminal.app-specific control sequence
     printf '\e]7;%s\a' "file://$HOST$URL_PATH"
   }
   # Use a precmd hook instead of a chpwd hook to avoid contaminating output
   precmd_functions+=(update_terminalapp_cwd)
   # Run once to get initial cwd set
   update_terminalapp_cwd
 fi

plugins/archlinux/archlinux.plugin.zsh

Diff comments View file @ 61aaa7b

plugins/branch/README.md

Diff comments View file @ 61aaa7b

File was created	1	# Branch
	2
	3	Displays the current Git or Mercurial branch fast.
	4
	5	## Speed test
	6
	7	### Mercurial
	8
	9	```shell
	10	$ time hg branch
	11	0.11s user 0.14s system 70% cpu 0.355 total
	12	```
	13
	14	### Branch plugin
	15
	16	```shell
	17	$ time zsh /tmp/branch_prompt_info_test.zsh
	18	0.00s user 0.01s system 78% cpu 0.014 total
	19	```
	20
	21	## Usage
	22
	23	Edit your theme file (eg.: `~/.oh-my-zsh/theme/robbyrussell.zsh-theme`)
	24	adding `$(branch_prompt_info)` in your prompt like this:
	25
	26	```diff
	27	- PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
	28	+ PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)$(branch_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
	29	```
	30
	31	## Maintainer
	32
	33	Victor Torres (<vpaivatorres@gmail.com>)
	34

plugins/branch/branch.plugin.zsh

Diff comments View file @ 61aaa7b

File was created	1	# Branch: displays the current Git or Mercurial branch fast.
	2	# Victor Torres <vpaivatorres@gmail.com>
	3	# Oct 2, 2015
	4
	5	function branch_prompt_info() {
	6	# Defines path as current directory
	7	local current_dir=$PWD
	8	# While current path is not root path
	9	while [[ $current_dir != '/' ]]
	10	do
	11	# Git repository
	12	if [[ -d "${current_dir}/.git" ]]
	13	then
	14	echo '±' ${"$(<"$current_dir/.git/HEAD")"##*/}
	15	return;
	16	fi
	17	# Mercurial repository
	18	if [[ -d "${current_dir}/.hg" ]]
	19	then
	20	echo '☿' $(<"$current_dir/.hg/branch")
	21	return;
	22	fi
	23	# Defines path as parent directory and keeps looking for :)
	24	current_dir="${current_dir:h}"
	25	done
	26	}
	27

plugins/colored-man-pages/colored-man-pages.plugin.zsh

Diff comments View file @ 61aaa7b

1	if [ "$OSTYPE[0,7]" = "solaris" ]	1	if [[ "$OSTYPE" = solaris* ]]
2	then	2	then
3	if [ ! -x ${HOME}/bin/nroff ]	3	if [[ ! -x "$HOME/bin/nroff" ]]
4	then	4	then
5	mkdir -p ${HOME}/bin	5	mkdir -p "$HOME/bin"
6	cat > ${HOME}/bin/nroff <<EOF	6	cat > "$HOME/bin/nroff" <<EOF
7	#!/bin/sh	7	#!/bin/sh
8	if [ -n "\$_NROFF_U" -a "\$1,\$2,\$3" = "-u0,-Tlp,-man" ]; then	8	if [ -n "\$_NROFF_U" -a "\$1,\$2,\$3" = "-u0,-Tlp,-man" ]; then
9	shift	9	shift
10	exec /usr/bin/nroff -u\${_NROFF_U} "\$@"	10	exec /usr/bin/nroff -u\$_NROFF_U "\$@"
11	fi	11	fi
12	#-- Some other invocation of nroff	12	#-- Some other invocation of nroff
13	exec /usr/bin/nroff "\$@"	13	exec /usr/bin/nroff "\$@"
14	EOF	14	EOF
15	chmod +x ${HOME}/bin/nroff	15	chmod +x "$HOME/bin/nroff"
16	fi	16	fi
17	fi	17	fi
18		18
19	man() {	19	man() {
20	env \	20	env \
21	LESS_TERMCAP_mb=$(printf "\e[1;31m") \	21	LESS_TERMCAP_mb=$(printf "\e[1;31m") \
22	LESS_TERMCAP_md=$(printf "\e[1;31m") \	22	LESS_TERMCAP_md=$(printf "\e[1;31m") \
23	LESS_TERMCAP_me=$(printf "\e[0m") \	23	LESS_TERMCAP_me=$(printf "\e[0m") \
24	LESS_TERMCAP_se=$(printf "\e[0m") \	24	LESS_TERMCAP_se=$(printf "\e[0m") \
25	LESS_TERMCAP_so=$(printf "\e[1;44;33m") \	25	LESS_TERMCAP_so=$(printf "\e[1;44;33m") \
26	LESS_TERMCAP_ue=$(printf "\e[0m") \	26	LESS_TERMCAP_ue=$(printf "\e[0m") \
27	LESS_TERMCAP_us=$(printf "\e[1;32m") \	27	LESS_TERMCAP_us=$(printf "\e[1;32m") \
28	PAGER=/usr/bin/less \	28	PAGER="${commands[less]:-$PAGER}" \
29	_NROFF_U=1 \	29	_NROFF_U=1 \
30	PATH=${HOME}/bin:${PATH} \	30	PATH="$HOME/bin:$PATH" \
31	man "$@"	31	man "$@"
32	}	32	}
33		33

plugins/common-aliases/common-aliases.plugin.zsh

Diff comments View file @ 61aaa7b

1	# Advanced Aliases.	1	# Advanced Aliases.
2	# Use with caution	2	# Use with caution
3	#	3	#
4		4
5	# ls, the common ones I use a lot shortened for rapid fire usage	5	# ls, the common ones I use a lot shortened for rapid fire usage
6	alias l='ls -lFh' #size,show type,human readable	6	alias l='ls -lFh' #size,show type,human readable
7	alias la='ls -lAFh' #long list,show almost all,show type,human readable	7	alias la='ls -lAFh' #long list,show almost all,show type,human readable
8	alias lr='ls -tRFh' #sorted by date,recursive,show type,human readable	8	alias lr='ls -tRFh' #sorted by date,recursive,show type,human readable
9	alias lt='ls -ltFh' #long list,sorted by date,show type,human readable	9	alias lt='ls -ltFh' #long list,sorted by date,show type,human readable
10	alias ll='ls -l' #long list	10	alias ll='ls -l' #long list
11	alias ldot='ls -ld .*'	11	alias ldot='ls -ld .*'
12	alias lS='ls -1FSsh'	12	alias lS='ls -1FSsh'
13	alias lart='ls -1Fcart'	13	alias lart='ls -1Fcart'
14	alias lrt='ls -1Fcrt'	14	alias lrt='ls -1Fcrt'
15		15
16	alias zshrc='$EDITOR ~/.zshrc' # Quick access to the ~/.zshrc file	16	alias zshrc='$EDITOR ~/.zshrc' # Quick access to the ~/.zshrc file
17		17
18	alias grep='grep --color'	18	alias grep='grep --color'
19	alias sgrep='grep -R -n -H -C 5 --exclude-dir={.git,.svn,CVS} '	19	alias sgrep='grep -R -n -H -C 5 --exclude-dir={.git,.svn,CVS} '
20		20
21	alias t='tail -f'	21	alias t='tail -f'
22		22
23	# Command line head / tail shortcuts	23	# Command line head / tail shortcuts
24	alias -g H='\| head'	24	alias -g H='\| head'
25	alias -g T='\| tail'	25	alias -g T='\| tail'
26	alias -g G='\| grep'	26	alias -g G='\| grep'
27	alias -g L="\| less"	27	alias -g L="\| less"
28	alias -g M="\| most"	28	alias -g M="\| most"
29	alias -g LL="2>&1 \| less"	29	alias -g LL="2>&1 \| less"
30	alias -g CA="2>&1 \| cat -A"	30	alias -g CA="2>&1 \| cat -A"
31	alias -g NE="2> /dev/null"	31	alias -g NE="2> /dev/null"
32	alias -g NUL="> /dev/null 2>&1"	32	alias -g NUL="> /dev/null 2>&1"
33	alias -g P="2>&1\| pygmentize -l pytb"	33	alias -g P="2>&1\| pygmentize -l pytb"
34		34
35	alias dud='du -d 1 -h'	35	alias dud='du -d 1 -h'
36	alias duf='du -sh *'	36	alias duf='du -sh *'
37	alias fd='find . -type d -name'	37	alias fd='find . -type d -name'
38	alias ff='find . -type f -name'	38	alias ff='find . -type f -name'
39		39
40	alias h='history'	40	alias h='history'
41	alias hgrep="fc -El 0 \| grep"	41	alias hgrep="fc -El 0 \| grep"
42	alias help='man'	42	alias help='man'
43	alias p='ps -f'	43	alias p='ps -f'
44	alias sortnr='sort -n -r'	44	alias sortnr='sort -n -r'
45	alias unexport='unset'	45	alias unexport='unset'
46		46
47	alias whereami=display_info	47	alias whereami=display_info
48		48
49	alias rm='rm -i'	49	alias rm='rm -i'
50	alias cp='cp -i'	50	alias cp='cp -i'
51	alias mv='mv -i'	51	alias mv='mv -i'
52		52
53	# zsh is able to auto-do some kungfoo	53	# zsh is able to auto-do some kungfoo
54	# depends on the SUFFIX :)	54	# depends on the SUFFIX :)
55	if [ ${ZSH_VERSION//\./} -ge 420 ]; then	55	if is-at-least 4.2.0; then
56	# open browser on urls	56	# open browser on urls
57	_browser_fts=(htm html de org net com at cx nl se dk dk php)	57	_browser_fts=(htm html de org net com at cx nl se dk dk php)
58	for ft in $_browser_fts ; do alias -s $ft=$BROWSER ; done	58	for ft in $_browser_fts ; do alias -s $ft=$BROWSER ; done
59		59
60	_editor_fts=(cpp cxx cc c hh h inl asc txt TXT tex)	60	_editor_fts=(cpp cxx cc c hh h inl asc txt TXT tex)
61	for ft in $_editor_fts ; do alias -s $ft=$EDITOR ; done	61	for ft in $_editor_fts ; do alias -s $ft=$EDITOR ; done
62		62
63	_image_fts=(jpg jpeg png gif mng tiff tif xpm)	63	_image_fts=(jpg jpeg png gif mng tiff tif xpm)
64	for ft in $_image_fts ; do alias -s $ft=$XIVIEWER; done	64	for ft in $_image_fts ; do alias -s $ft=$XIVIEWER; done
65		65
66	_media_fts=(ape avi flv mkv mov mp3 mpeg mpg ogg ogm rm wav webm)	66	_media_fts=(ape avi flv mkv mov mp3 mpeg mpg ogg ogm rm wav webm)
67	for ft in $_media_fts ; do alias -s $ft=mplayer ; done	67	for ft in $_media_fts ; do alias -s $ft=mplayer ; done
68		68
69	#read documents	69	#read documents
70	alias -s pdf=acroread	70	alias -s pdf=acroread
71	alias -s ps=gv	71	alias -s ps=gv
72	alias -s dvi=xdvi	72	alias -s dvi=xdvi
73	alias -s chm=xchm	73	alias -s chm=xchm
74	alias -s djvu=djview	74	alias -s djvu=djview
75		75
76	#list whats inside packed file	76	#list whats inside packed file
77	alias -s zip="unzip -l"	77	alias -s zip="unzip -l"
78	alias -s rar="unrar l"	78	alias -s rar="unrar l"
79	alias -s tar="tar tf"	79	alias -s tar="tar tf"
80	alias -s tar.gz="echo "	80	alias -s tar.gz="echo "
81	alias -s ace="unace l"	81	alias -s ace="unace l"
82	fi	82	fi
83		83
84	# Make zsh know about hosts already accessed by SSH	84	# Make zsh know about hosts already accessed by SSH
85	zstyle -e ':completion::(ssh\|scp\|sftp\|rsh\|rsync):hosts' hosts 'reply=(${=${${(f)"$(cat {/etc/ssh_,~/.ssh/known_}hosts(\|2)(N) /dev/null)"}%%[# ]}//,/ })'	85	zstyle -e ':completion::(ssh\|scp\|sftp\|rsh\|rsync):hosts' hosts 'reply=(${=${${(f)"$(cat {/etc/ssh_,~/.ssh/known_}hosts(\|2)(N) /dev/null)"}%%[# ]}//,/ })'
86		86
87		87

plugins/composer/composer.plugin.zsh

Diff comments View file @ 61aaa7b

1	# ------------------------------------------------------------------------------	1	# ------------------------------------------------------------------------------
2	# FILE: composer.plugin.zsh	2	# FILE: composer.plugin.zsh
3	# DESCRIPTION: oh-my-zsh composer plugin file.	3	# DESCRIPTION: oh-my-zsh composer plugin file.
4	# AUTHOR: Daniel Gomes (me@danielcsgomes.com)	4	# AUTHOR: Daniel Gomes (me@danielcsgomes.com)
5	# VERSION: 1.0.0	5	# VERSION: 1.0.0
6	# ------------------------------------------------------------------------------	6	# ------------------------------------------------------------------------------
7		7
8	# Composer basic command completion	8	# Composer basic command completion
9	_composer_get_command_list () {	9	_composer_get_command_list () {
10	$_comp_command1 --no-ansi \| sed "1,/Available commands/d" \| awk '/^[ \t]*[a-z]+/ { print $1 }'	10	$_comp_command1 --no-ansi 2>/dev/null \| sed "1,/Available commands/d" \| awk '/^[ \t]*[a-z]+/ { print $1 }'
11	}	11	}
12		12
13	_composer_get_required_list () {	13	_composer_get_required_list () {
14	$_comp_command1 show -s --no-ansi \| sed '1,/requires/d' \| awk 'NF > 0 && !/^requires $dev$/{ print $1 }'	14	$_comp_command1 show -s --no-ansi 2>/dev/null \| sed '1,/requires/d' \| awk 'NF > 0 && !/^requires $dev$/{ print $1 }'
15	}	15	}
16		16
17	_composer () {	17	_composer () {
18	local curcontext="$curcontext" state line	18	local curcontext="$curcontext" state line
19	typeset -A opt_args	19	typeset -A opt_args
20	_arguments \	20	_arguments \
21	'1: :->command'\	21	'1: :->command'\
22	'*: :->args'	22	'*: :->args'
23		23
24	case $state in	24	case $state in
25	command)	25	command)
26	compadd $(_composer_get_command_list)	26	compadd $(_composer_get_command_list)
27	;;	27	;;
28	*)	28	*)
29	compadd $(_composer_get_required_list)	29	compadd $(_composer_get_required_list)
30	;;	30	;;
31	esac	31	esac
32	}	32	}
33		33
34	compdef _composer composer	34	compdef _composer composer
35	compdef _composer composer.phar	35	compdef _composer composer.phar
36		36
37	# Aliases	37	# Aliases
38	alias c='composer'	38	alias c='composer'
39	alias csu='composer self-update'	39	alias csu='composer self-update'
40	alias cu='composer update'	40	alias cu='composer update'
41	alias cr='composer require'	41	alias cr='composer require'
42	alias ci='composer install'	42	alias ci='composer install'
43	alias ccp='composer create-project'	43	alias ccp='composer create-project'
44	alias cdu='composer dump-autoload'	44	alias cdu='composer dump-autoload'
45	alias cgu='composer global update'	45	alias cgu='composer global update'
46	alias cgr='composer global require'	46	alias cgr='composer global require'
47		47
48	# install composer in the current directory	48	# install composer in the current directory
49	alias cget='curl -s https://getcomposer.org/installer \| php'	49	alias cget='curl -s https://getcomposer.org/installer \| php'
50		50
51	# Add Composer's global binaries to PATH	51	# Add Composer's global binaries to PATH
52	export PATH=$PATH:~/.composer/vendor/bin	52	export PATH=$PATH:~/.composer/vendor/bin
53		53

plugins/ember-cli/README.md

Diff comments View file @ 61aaa7b

1	# Ember CLI	1	# Ember CLI
2		2
3	Maintainers: [BilalBudhani](http://www.github.com/BilalBudhani), [eubenesa](http://www.github.com/eubenesa)	3	Maintainers: [BilalBudhani](http://www.github.com/BilalBudhani), [eubenesa](http://www.github.com/eubenesa)
4		4
5	Ember CLI (http://www.ember-cli.com/)	5	Ember CLI (http://www.ember-cli.com/)
6		6
7	### List of Aliases	7	### List of Aliases
8		8
9	alias es='ember serve'	9	Alias \| Ember-CLI command
10	alias ea='ember addon'	10	----- \| -----------------
11	alias eb='ember build'	11	es \| ember serve
12	alias ed='ember destroy'	12	ea \| ember addon
13	alias eg='ember generate'	13	eb \| ember build
14	alias eh='ember help'	14	ed \| ember destroy
15	alias ein='ember init'	15	eg \| ember generate
16	alias ei='ember install'	16	eh \| ember help
17	alias et='ember test'	17	ein \| ember init
18	alias eu='ember update'	18	ei \| ember install
19	alias ev='ember version'	19	et \| ember test
		20	eu \| ember update
		21	ev \| ember version
20		22

plugins/extract/extract.plugin.zsh

Diff comments View file @ 61aaa7b

1	# ------------------------------------------------------------------------------	1	# ------------------------------------------------------------------------------
2	# FILE: extract.plugin.zsh	2	# FILE: extract.plugin.zsh
3	# DESCRIPTION: oh-my-zsh plugin file.	3	# DESCRIPTION: oh-my-zsh plugin file.
4	# AUTHOR: Sorin Ionescu (sorin.ionescu@gmail.com)	4	# AUTHOR: Sorin Ionescu (sorin.ionescu@gmail.com)
5	# VERSION: 1.0.1	5	# VERSION: 1.0.1
6	# ------------------------------------------------------------------------------	6	# ------------------------------------------------------------------------------
7		7
8		8
9	function extract() {	9	function extract() {
10	local remove_archive	10	local remove_archive
11	local success	11	local success
12	local file_name	12	local file_name
13	local extract_dir	13	local extract_dir
14		14
15	if (( $# == 0 )); then	15	if (( $# == 0 )); then
16	echo "Usage: extract [-option] [file ...]"	16	echo "Usage: extract [-option] [file ...]"
17	echo	17	echo
18	echo Options:	18	echo Options:
19	echo " -r, --remove Remove archive."	19	echo " -r, --remove Remove archive."
20	echo	20	echo
21	echo "Report bugs to <sorin.ionescu@gmail.com>."	21	echo "Report bugs to <sorin.ionescu@gmail.com>."
22	fi	22	fi
23		23
24	remove_archive=1	24	remove_archive=1
25	if [[ "$1" == "-r" ]] \|\| [[ "$1" == "--remove" ]]; then	25	if [[ "$1" == "-r" ]] \|\| [[ "$1" == "--remove" ]]; then
26	remove_archive=0	26	remove_archive=0
27	shift	27	shift
28	fi	28	fi
29		29
30	while (( $# > 0 )); do	30	while (( $# > 0 )); do
31	if [[ ! -f "$1" ]]; then	31	if [[ ! -f "$1" ]]; then
32	echo "extract: '$1' is not a valid file" 1>&2	32	echo "extract: '$1' is not a valid file" 1>&2
33	shift	33	shift
34	continue	34	continue
35	fi	35	fi
36		36
37	success=0	37	success=0
38	file_name="$( basename "$1" )"	38	file_name="$( basename "$1" )"
39	extract_dir="$( echo "$file_name" \| sed "s/\.${1##*.}//g" )"	39	extract_dir="$( echo "$file_name" \| sed "s/\.${1##*.}//g" )"
40	case "$1" in	40	case "$1" in
41	(.tar.gz\|.tgz) [ -z $commands[pigz] ] && tar zxvf "$1" \|\| pigz -dc "$1" \| tar xv ;;	41	(.tar.gz\|.tgz) [ -z $commands[pigz] ] && tar zxvf "$1" \|\| pigz -dc "$1" \| tar xv ;;
42	(.tar.bz2\|.tbz\|*.tbz2) tar xvjf "$1" ;;	42	(.tar.bz2\|.tbz\|*.tbz2) tar xvjf "$1" ;;
43	(.tar.xz\|.txz) tar --xz --help &> /dev/null \	43	(.tar.xz\|.txz) tar --xz --help &> /dev/null \
44	&& tar --xz -xvf "$1" \	44	&& tar --xz -xvf "$1" \
45	\|\| xzcat "$1" \| tar xvf - ;;	45	\|\| xzcat "$1" \| tar xvf - ;;
46	(.tar.zma\|.tlz) tar --lzma --help &> /dev/null \	46	(.tar.zma\|.tlz) tar --lzma --help &> /dev/null \
47	&& tar --lzma -xvf "$1" \	47	&& tar --lzma -xvf "$1" \
48	\|\| lzcat "$1" \| tar xvf - ;;	48	\|\| lzcat "$1" \| tar xvf - ;;
49	(*.tar) tar xvf "$1" ;;	49	(*.tar) tar xvf "$1" ;;
50	(*.gz) [ -z $commands[pigz] ] && gunzip "$1" \|\| pigz -d "$1" ;;	50	(*.gz) [ -z $commands[pigz] ] && gunzip "$1" \|\| pigz -d "$1" ;;
51	(*.bz2) bunzip2 "$1" ;;	51	(*.bz2) bunzip2 "$1" ;;
52	(*.xz) unxz "$1" ;;	52	(*.xz) unxz "$1" ;;
53	(*.lzma) unlzma "$1" ;;	53	(*.lzma) unlzma "$1" ;;
54	(*.Z) uncompress "$1" ;;	54	(*.Z) uncompress "$1" ;;
55	(.zip\|.war\|.jar\|.sublime-package\|*.ipsw) unzip "$1" -d $extract_dir ;;	55	(.zip\|.war\|.jar\|.sublime-package\|.ipsw\|.xpi\|*.apk) unzip "$1" -d $extract_dir ;;
56	(*.rar) unrar x -ad "$1" ;;	56	(*.rar) unrar x -ad "$1" ;;
57	(*.7z) 7za x "$1" ;;	57	(*.7z) 7za x "$1" ;;
58	(*.deb)	58	(*.deb)
59	mkdir -p "$extract_dir/control"	59	mkdir -p "$extract_dir/control"
60	mkdir -p "$extract_dir/data"	60	mkdir -p "$extract_dir/data"
61	cd "$extract_dir"; ar vx "../${1}" > /dev/null	61	cd "$extract_dir"; ar vx "../${1}" > /dev/null
62	cd control; tar xzvf ../control.tar.gz	62	cd control; tar xzvf ../control.tar.gz
63	cd ../data; tar xzvf ../data.tar.gz	63	cd ../data; tar xzvf ../data.tar.gz
64	cd ..; rm *.tar.gz debian-binary	64	cd ..; rm *.tar.gz debian-binary
65	cd ..	65	cd ..
66	;;	66	;;
67	(*)	67	(*)
68	echo "extract: '$1' cannot be extracted" 1>&2	68	echo "extract: '$1' cannot be extracted" 1>&2
69	success=1	69	success=1
70	;;	70	;;
71	esac	71	esac
72		72
73	(( success = $success > 0 ? $success : $? ))	73	(( success = $success > 0 ? $success : $? ))
74	(( $success == 0 )) && (( $remove_archive == 0 )) && rm "$1"	74	(( $success == 0 )) && (( $remove_archive == 0 )) && rm "$1"
75	shift	75	shift
76	done	76	done
77	}	77	}
78		78
79	alias x=extract	79	alias x=extract
80		80
81		81

plugins/git-extras/git-extras.plugin.zsh

Diff comments View file @ 61aaa7b

1	# ------------------------------------------------------------------------------	1	# ------------------------------------------------------------------------------
2	# Description	2	# Description
3	# -----------	3	# -----------
4	#	4	#
5	# Completion script for git-extras (http://github.com/tj/git-extras).	5	# Completion script for git-extras (http://github.com/tj/git-extras).
6	#	6	#
7	# This depends on and reueses some of the internals of the _git completion	7	# This depends on and reuses some of the internals of the _git completion
8	# function that ships with zsh itself. It will not work with the _git that ships	8	# function that ships with zsh itself. It will not work with the _git that ships
9	# with git.	9	# with git.
10	#	10	#
11	# ------------------------------------------------------------------------------	11	# ------------------------------------------------------------------------------
12	# Authors	12	# Authors
13	# -------	13	# -------
14	#	14	#
15	# * Alexis GRIMALDI (https://github.com/agrimaldi)	15	# * Alexis GRIMALDI (https://github.com/agrimaldi)
16	# * spacewander (https://github.com/spacewander)	16	# * spacewander (https://github.com/spacewander)
17	#	17	#
18	# ------------------------------------------------------------------------------	18	# ------------------------------------------------------------------------------
19	# Inspirations	19	# Inspirations
20	# -----------	20	# -----------
21	#	21	#
22	# * git-extras (http://github.com/tj/git-extras)	22	# * git-extras (http://github.com/tj/git-extras)
23	# * git-flow-completion (http://github.com/bobthecow/git-flow-completion)	23	# * git-flow-completion (http://github.com/bobthecow/git-flow-completion)
24	#	24	#
25	# ------------------------------------------------------------------------------	25	# ------------------------------------------------------------------------------
26		26
27		27
28	# Internal functions	28	# Internal functions
29	# These are a lot like their __git_* equivalents inside _git	29	# These are a lot like their __git_* equivalents inside _git
30		30
31	__gitex_command_successful () {	31	__gitex_command_successful () {
32	if (( ${#*:#0} > 0 )); then	32	if (( ${#*:#0} > 0 )); then
33	_message 'not a git repository'	33	_message 'not a git repository'
34	return 1	34	return 1
35	fi	35	fi
36	return 0	36	return 0
37	}	37	}
38		38
39	__gitex_commits() {	39	__gitex_commits() {
40	declare -A commits	40	declare -A commits
41	git log --oneline -15 \| sed 's/$[[:alnum:]]\{7\}$ /\1:/' \| while read commit	41	git log --oneline -15 \| sed 's/$[[:alnum:]]\{7\}$ /\1:/' \| while read commit
42	do	42	do
43	hash=$(echo $commit \| cut -d':' -f1)	43	hash=$(echo $commit \| cut -d':' -f1)
44	commits[$hash]="$commit"	44	commits[$hash]="$commit"
45	done	45	done
46	local ret=1	46	local ret=1
47	_describe -t commits commit commits && ret=0	47	_describe -t commits commit commits && ret=0
48	}	48	}
49		49
50	__gitex_tag_names() {	50	__gitex_tag_names() {
51	local expl	51	local expl
52	declare -a tag_names	52	declare -a tag_names
53	tag_names=(${${(f)"$(_call_program tags git for-each-ref --format='"%(refname)"' refs/tags 2>/dev/null)"}#refs/tags/})	53	tag_names=(${${(f)"$(_call_program tags git for-each-ref --format='"%(refname)"' refs/tags 2>/dev/null)"}#refs/tags/})
54	__git_command_successful \|\| return	54	__git_command_successful \|\| return
55	_wanted tag-names expl tag-name compadd $* - $tag_names	55	_wanted tag-names expl tag-name compadd $* - $tag_names
56	}	56	}
57		57
58		58
59	__gitex_branch_names() {	59	__gitex_branch_names() {
60	local expl	60	local expl
61	declare -a branch_names	61	declare -a branch_names
62	branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads 2>/dev/null)"}#refs/heads/})	62	branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads 2>/dev/null)"}#refs/heads/})
63	__git_command_successful \|\| return	63	__git_command_successful \|\| return
64	_wanted branch-names expl branch-name compadd $* - $branch_names	64	_wanted branch-names expl branch-name compadd $* - $branch_names
65	}	65	}
66		66
67	__gitex_specific_branch_names() {	67	__gitex_specific_branch_names() {
68	local expl	68	local expl
69	declare -a branch_names	69	declare -a branch_names
70	branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads/"$1" 2>/dev/null)"}#refs/heads/$1/})	70	branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads/"$1" 2>/dev/null)"}#refs/heads/$1/})
71	__git_command_successful \|\| return	71	__git_command_successful \|\| return
72	_wanted branch-names expl branch-name compadd $* - $branch_names	72	_wanted branch-names expl branch-name compadd $* - $branch_names
73	}	73	}
74		74
75	__gitex_feature_branch_names() {	75	__gitex_feature_branch_names() {
76	__gitex_specific_branch_names 'feature'	76	__gitex_specific_branch_names 'feature'
77	}	77	}
78		78
79	__gitex_refactor_branch_names() {	79	__gitex_refactor_branch_names() {
80	__gitex_specific_branch_names 'refactor'	80	__gitex_specific_branch_names 'refactor'
81	}	81	}
82		82
83	__gitex_bug_branch_names() {	83	__gitex_bug_branch_names() {
84	__gitex_specific_branch_names 'bug'	84	__gitex_specific_branch_names 'bug'
85	}	85	}
86		86
87	__gitex_submodule_names() {	87	__gitex_submodule_names() {
88	local expl	88	local expl
89	declare -a submodule_names	89	declare -a submodule_names
90	submodule_names=(${(f)"$(_call_program branchrefs git submodule status \| awk '{print $2}')"}) # '	90	submodule_names=(${(f)"$(_call_program branchrefs git submodule status \| awk '{print $2}')"}) # '
91	__git_command_successful \|\| return	91	__git_command_successful \|\| return
92	_wanted submodule-names expl submodule-name compadd $* - $submodule_names	92	_wanted submodule-names expl submodule-name compadd $* - $submodule_names
93	}	93	}
94		94
95		95
96	__gitex_author_names() {	96	__gitex_author_names() {
97	local expl	97	local expl
98	declare -a author_names	98	declare -a author_names
99	author_names=(${(f)"$(_call_program branchrefs git log --format='%aN' \| sort -u)"})	99	author_names=(${(f)"$(_call_program branchrefs git log --format='%aN' \| sort -u)"})
100	__git_command_successful \|\| return	100	__git_command_successful \|\| return
101	_wanted author-names expl author-name compadd $* - $author_names	101	_wanted author-names expl author-name compadd $* - $author_names
102	}	102	}
103		103
104	# subcommands	104	# subcommands
105		105
106	_git-bug() {	106	_git-bug() {
107	local curcontext=$curcontext state line ret=1	107	local curcontext=$curcontext state line ret=1
108	declare -A opt_args	108	declare -A opt_args
109		109
110	_arguments -C \	110	_arguments -C \
111	': :->command' \	111	': :->command' \
112	'*:: :->option-or-argument' && ret=0	112	'*:: :->option-or-argument' && ret=0
113		113
114	case $state in	114	case $state in
115	(command)	115	(command)
116	declare -a commands	116	declare -a commands
117	commands=(	117	commands=(
118	'finish:merge bug into the current branch'	118	'finish:merge bug into the current branch'
119	)	119	)
120	_describe -t commands command commands && ret=0	120	_describe -t commands command commands && ret=0
121	;;	121	;;
122	(option-or-argument)	122	(option-or-argument)
123	curcontext=${curcontext%:*}-$line[1]:	123	curcontext=${curcontext%:*}-$line[1]:
124	case $line[1] in	124	case $line[1] in
125	(finish)	125	(finish)
126	_arguments -C \	126	_arguments -C \
127	':branch-name:__gitex_bug_branch_names'	127	':branch-name:__gitex_bug_branch_names'
128	;;	128	;;
129	esac	129	esac
130	esac	130	esac
131	}	131	}
132		132
133		133
134	_git-changelog() {	134	_git-changelog() {
135	_arguments \	135	_arguments \
136	'(-l --list)'{-l,--list}'[list commits]' \	136	'(-l --list)'{-l,--list}'[list commits]' \
137	}	137	}
138		138
139		139
140		140
141	_git-contrib() {	141	_git-contrib() {
142	_arguments \	142	_arguments \
143	':author:__gitex_author_names'	143	':author:__gitex_author_names'
144	}	144	}
145		145
146		146
147	_git-count() {	147	_git-count() {
148	_arguments \	148	_arguments \
149	'--all[detailed commit count]'	149	'--all[detailed commit count]'
150	}	150	}
151		151
152		152
153	_git-delete-branch() {	153	_git-delete-branch() {
154	_arguments \	154	_arguments \
155	':branch-name:__gitex_branch_names'	155	':branch-name:__gitex_branch_names'
156	}	156	}
157		157
158		158
159	_git-delete-submodule() {	159	_git-delete-submodule() {
160	_arguments \	160	_arguments \
161	':submodule-name:__gitex_submodule_names'	161	':submodule-name:__gitex_submodule_names'
162	}	162	}
163		163
164		164
165	_git-delete-tag() {	165	_git-delete-tag() {
166	_arguments \	166	_arguments \
167	':tag-name:__gitex_tag_names'	167	':tag-name:__gitex_tag_names'
168	}	168	}
169		169
170		170
171	_git-effort() {	171	_git-effort() {
172	_arguments \	172	_arguments \
173	'--above[ignore file with less than x commits]'	173	'--above[ignore file with less than x commits]'
174	}	174	}
175		175
176		176
177	_git-extras() {	177	_git-extras() {
178	local curcontext=$curcontext state line ret=1	178	local curcontext=$curcontext state line ret=1
179	declare -A opt_args	179	declare -A opt_args
180		180
181	_arguments -C \	181	_arguments -C \
182	': :->command' \	182	': :->command' \
183	'*:: :->option-or-argument' && ret=0	183	'*:: :->option-or-argument' && ret=0
184		184
185	case $state in	185	case $state in
186	(command)	186	(command)
187	declare -a commands	187	declare -a commands
188	commands=(	188	commands=(
189	'update:update git-extras'	189	'update:update git-extras'
190	)	190	)
191	_describe -t commands command commands && ret=0	191	_describe -t commands command commands && ret=0
192	;;	192	;;
193	esac	193	esac
194		194
195	_arguments \	195	_arguments \
196	'(-v --version)'{-v,--version}'[show current version]'	196	'(-v --version)'{-v,--version}'[show current version]'
197	}	197	}
198		198
199		199
200	_git-feature() {	200	_git-feature() {
201	local curcontext=$curcontext state line ret=1	201	local curcontext=$curcontext state line ret=1
202	declare -A opt_args	202	declare -A opt_args
203		203
204	_arguments -C \	204	_arguments -C \
205	': :->command' \	205	': :->command' \
206	'*:: :->option-or-argument' && ret=0	206	'*:: :->option-or-argument' && ret=0
207		207
208	case $state in	208	case $state in
209	(command)	209	(command)
210	declare -a commands	210	declare -a commands
211	commands=(	211	commands=(
212	'finish:merge feature into the current branch'	212	'finish:merge feature into the current branch'
213	)	213	)
214	_describe -t commands command commands && ret=0	214	_describe -t commands command commands && ret=0
215	;;	215	;;
216	(option-or-argument)	216	(option-or-argument)
217	curcontext=${curcontext%:*}-$line[1]:	217	curcontext=${curcontext%:*}-$line[1]:
218	case $line[1] in	218	case $line[1] in
219	(finish)	219	(finish)
220	_arguments -C \	220	_arguments -C \
221	':branch-name:__gitex_feature_branch_names'	221	':branch-name:__gitex_feature_branch_names'
222	;;	222	;;
223	esac	223	esac
224	esac	224	esac
225	}	225	}
226		226
227		227
228	_git-graft() {	228	_git-graft() {
229	_arguments \	229	_arguments \
230	':src-branch-name:__gitex_branch_names' \	230	':src-branch-name:__gitex_branch_names' \
231	':dest-branch-name:__gitex_branch_names'	231	':dest-branch-name:__gitex_branch_names'
232	}	232	}
233		233
234		234
235	_git-ignore() {	235	_git-ignore() {
236	_arguments -C \	236	_arguments -C \
237	'(--local -l)'{--local,-l}'[show local gitignore]' \	237	'(--local -l)'{--local,-l}'[show local gitignore]' \
238	'(--global -g)'{--global,-g}'[show global gitignore]'	238	'(--global -g)'{--global,-g}'[show global gitignore]'
239	}	239	}
240		240
241		241
242	_git-missing() {	242	_git-missing() {
243	_arguments \	243	_arguments \
244	':first-branch-name:__gitex_branch_names' \	244	':first-branch-name:__gitex_branch_names' \
245	':second-branch-name:__gitex_branch_names'	245	':second-branch-name:__gitex_branch_names'
246	}	246	}
247		247
248		248
249	_git-refactor() {	249	_git-refactor() {
250	local curcontext=$curcontext state line ret=1	250	local curcontext=$curcontext state line ret=1
251	declare -A opt_args	251	declare -A opt_args
252		252
253	_arguments -C \	253	_arguments -C \
254	': :->command' \	254	': :->command' \
255	'*:: :->option-or-argument' && ret=0	255	'*:: :->option-or-argument' && ret=0
256		256
257	case $state in	257	case $state in
258	(command)	258	(command)
259	declare -a commands	259	declare -a commands
260	commands=(	260	commands=(
261	'finish:merge refactor into the current branch'	261	'finish:merge refactor into the current branch'
262	)	262	)
263	_describe -t commands command commands && ret=0	263	_describe -t commands command commands && ret=0
264	;;	264	;;
265	(option-or-argument)	265	(option-or-argument)
266	curcontext=${curcontext%:*}-$line[1]:	266	curcontext=${curcontext%:*}-$line[1]:
267	case $line[1] in	267	case $line[1] in
268	(finish)	268	(finish)
269	_arguments -C \	269	_arguments -C \
270	':branch-name:__gitex_refactor_branch_names'	270	':branch-name:__gitex_refactor_branch_names'
271	;;	271	;;
272	esac	272	esac
273	esac	273	esac
274	}	274	}
275		275
276		276
277	_git-squash() {	277	_git-squash() {
278	_arguments \	278	_arguments \
279	':branch-name:__gitex_branch_names'	279	':branch-name:__gitex_branch_names'
280	}	280	}
281		281
282	_git-summary() {	282	_git-summary() {
283	_arguments '--line[summarize with lines rather than commits]'	283	_arguments '--line[summarize with lines rather than commits]'
284	__gitex_commits	284	__gitex_commits
285	}	285	}
286		286
287		287
288	_git-undo(){	288	_git-undo(){
289	_arguments -C \	289	_arguments -C \
290	'(--soft -s)'{--soft,-s}'[only rolls back the commit but changes remain un-staged]' \	290	'(--soft -s)'{--soft,-s}'[only rolls back the commit but changes remain un-staged]' \
291	'(--hard -h)'{--hard,-h}'[wipes your commit(s)]'	291	'(--hard -h)'{--hard,-h}'[wipes your commit(s)]'
292	}	292	}
293		293
294	zstyle ':completion:::git:*' user-commands \	294	zstyle ':completion:::git:*' user-commands \
295	alias:'define, search and show aliases' \	295	alias:'define, search and show aliases' \
296	archive-file:'export the current HEAD of the git repository to a archive' \	296	archive-file:'export the current HEAD of the git repository to a archive' \
297	back:'undo and stage latest commits' \	297	back:'undo and stage latest commits' \
298	bug:'create a bug branch' \	298	bug:'create a bug branch' \
299	changelog:'populate changelog file with commits since the previous tag' \	299	changelog:'populate changelog file with commits since the previous tag' \
300	commits-since:'list commits since a given date' \	300	commits-since:'list commits since a given date' \
301	contrib:'display author contributions' \	301	contrib:'display author contributions' \
302	count:'count commits' \	302	count:'count commits' \
303	create-branch:'create local and remote branch' \	303	create-branch:'create local and remote branch' \
304	delete-branch:'delete local and remote branch' \	304	delete-branch:'delete local and remote branch' \
305	delete-merged-branches:'delete merged branches'\	305	delete-merged-branches:'delete merged branches'\
306	delete-submodule:'delete submodule' \	306	delete-submodule:'delete submodule' \
307	delete-tag:'delete local and remote tag' \	307	delete-tag:'delete local and remote tag' \
308	effort:'display effort statistics' \	308	effort:'display effort statistics' \
309	extras:'git-extras' \	309	extras:'git-extras' \
310	feature:'create a feature branch' \	310	feature:'create a feature branch' \
311	fork:'fork a repo on github' \	311	fork:'fork a repo on github' \
312	fresh-branch:'create empty local branch' \	312	fresh-branch:'create empty local branch' \
313	gh-pages:'create the GitHub Pages branch' \	313	gh-pages:'create the GitHub Pages branch' \
314	graft:'merge commits from source branch to destination branch' \	314	graft:'merge commits from source branch to destination branch' \
315	ignore:'add patterns to .gitignore' \	315	ignore:'add patterns to .gitignore' \
316	info:'show info about the repository' \	316	info:'show info about the repository' \
317	local-commits:'list unpushed commits on the local branch' \	317	local-commits:'list unpushed commits on the local branch' \
318	lock:'lock a file excluded from version control' \	318	lock:'lock a file excluded from version control' \
319	locked:'ls files that have been locked' \	319	locked:'ls files that have been locked' \
320	missing:'show commits missing from another branch' \	320	missing:'show commits missing from another branch' \
321	pr:'checks out a pull request locally' \	321	pr:'checks out a pull request locally' \
322	rebase-patch:'rebases a patch' \	322	rebase-patch:'rebases a patch' \
323	refactor:'create a refactor branch' \	323	refactor:'create a refactor branch' \
324	release:'commit, tag and push changes to the repository' \	324	release:'commit, tag and push changes to the repository' \
325	rename-tag:'rename a tag' \	325	rename-tag:'rename a tag' \
326	repl:'read-eval-print-loop' \	326	repl:'read-eval-print-loop' \
327	reset-file:'reset one file' \	327	reset-file:'reset one file' \
328	root:'show path of root' \	328	root:'show path of root' \
329	setup:'setup a git repository' \	329	setup:'setup a git repository' \
330	show-tree:'show branch tree of commit history' \	330	show-tree:'show branch tree of commit history' \
331	squash:'merge commits from source branch into the current one as a single commit' \	331	squash:'merge commits from source branch into the current one as a single commit' \
332	summary:'repository summary' \	332	summary:'repository summary' \
333	touch:'one step creation of new files' \	333	touch:'one step creation of new files' \
334	undo:'remove the latest commit' \	334	undo:'remove the latest commit' \
335	unlock:'unlock a file excluded from version control'	335	unlock:'unlock a file excluded from version control'
336		336

plugins/git-flow/git-flow.plugin.zsh

Diff comments View file @ 61aaa7b

1	#!zsh	1	#!zsh
2	#	2	#
3	# Installation	3	# Installation
4	# ------------	4	# ------------
5	#	5	#
6	# To achieve git-flow completion nirvana:	6	# To achieve git-flow completion nirvana:
7	#	7	#
8	# 0. Update your zsh's git-completion module to the newest version.	8	# 0. Update your zsh's git-completion module to the newest version.
9	# From here. http://zsh.git.sourceforge.net/git/gitweb.cgi?p=zsh/zsh;a=blob_plain;f=Completion/Unix/Command/_git;hb=HEAD	9	# From here. https://raw.githubusercontent.com/zsh-users/zsh/master/Completion/Unix/Command/_git
10	#	10	#
11	# 1. Install this file. Either:	11	# 1. Install this file. Either:
12	#	12	#
13	# a. Place it in your .zshrc:	13	# a. Place it in your .zshrc:
14	#	14	#
15	# b. Or, copy it somewhere (e.g. ~/.git-flow-completion.zsh) and put the following line in	15	# b. Or, copy it somewhere (e.g. ~/.git-flow-completion.zsh) and put the following line in
16	# your .zshrc:	16	# your .zshrc:
17	#	17	#
18	# source ~/.git-flow-completion.zsh	18	# source ~/.git-flow-completion.zsh
19	#	19	#
20	# c. Or, use this file as an oh-my-zsh plugin.	20	# c. Or, use this file as an oh-my-zsh plugin.
21	#	21	#
22		22
23	#Alias	23	#Alias
24	alias gfl='git flow'	24	alias gfl='git flow'
25	alias gcd='git checkout develop'	25	alias gcd='git checkout develop'
26	alias gch='git checkout hotfix'	26	alias gch='git checkout hotfix'
27	alias gcr='git checkout release'	27	alias gcr='git checkout release'
28		28
29	_git-flow ()	29	_git-flow ()
30	{	30	{
31	local curcontext="$curcontext" state line	31	local curcontext="$curcontext" state line
32	typeset -A opt_args	32	typeset -A opt_args
33		33
34	_arguments -C \	34	_arguments -C \
35	':command:->command' \	35	':command:->command' \
36	'*::options:->options'	36	'*::options:->options'
37		37
38	case $state in	38	case $state in
39	(command)	39	(command)
40		40
41	local -a subcommands	41	local -a subcommands
42	subcommands=(	42	subcommands=(
43	'init:Initialize a new git repo with support for the branching model.'	43	'init:Initialize a new git repo with support for the branching model.'
44	'feature:Manage your feature branches.'	44	'feature:Manage your feature branches.'
45	'release:Manage your release branches.'	45	'release:Manage your release branches.'
46	'hotfix:Manage your hotfix branches.'	46	'hotfix:Manage your hotfix branches.'
47	'support:Manage your support branches.'	47	'support:Manage your support branches.'
48	'version:Shows version information.'	48	'version:Shows version information.'
49	)	49	)
50	_describe -t commands 'git flow' subcommands	50	_describe -t commands 'git flow' subcommands
51	;;	51	;;
52		52
53	(options)	53	(options)
54	case $line[1] in	54	case $line[1] in
55		55
56	(init)	56	(init)
57	_arguments \	57	_arguments \
58	-f'[Force setting of gitflow branches, even if already configured]'	58	-f'[Force setting of gitflow branches, even if already configured]'
59	;;	59	;;
60		60
61	(version)	61	(version)
62	;;	62	;;
63		63
64	(hotfix)	64	(hotfix)
65	__git-flow-hotfix	65	__git-flow-hotfix
66	;;	66	;;
67		67
68	(release)	68	(release)
69	__git-flow-release	69	__git-flow-release
70	;;	70	;;
71		71
72	(feature)	72	(feature)
73	__git-flow-feature	73	__git-flow-feature
74	;;	74	;;
75	esac	75	esac
76	;;	76	;;
77	esac	77	esac
78	}	78	}
79		79
80	__git-flow-release ()	80	__git-flow-release ()
81	{	81	{
82	local curcontext="$curcontext" state line	82	local curcontext="$curcontext" state line
83	typeset -A opt_args	83	typeset -A opt_args
84		84
85	_arguments -C \	85	_arguments -C \
86	':command:->command' \	86	':command:->command' \
87	'*::options:->options'	87	'*::options:->options'
88		88
89	case $state in	89	case $state in
90	(command)	90	(command)
91		91
92	local -a subcommands	92	local -a subcommands
93	subcommands=(	93	subcommands=(
94	'start:Start a new release branch.'	94	'start:Start a new release branch.'
95	'finish:Finish a release branch.'	95	'finish:Finish a release branch.'
96	'list:List all your release branches. (Alias to `git flow release`)'	96	'list:List all your release branches. (Alias to `git flow release`)'
97	'publish: public'	97	'publish: public'
98	'track: track'	98	'track: track'
99	)	99	)
100	_describe -t commands 'git flow release' subcommands	100	_describe -t commands 'git flow release' subcommands
101	_arguments \	101	_arguments \
102	-v'[Verbose (more) output]'	102	-v'[Verbose (more) output]'
103	;;	103	;;
104		104
105	(options)	105	(options)
106	case $line[1] in	106	case $line[1] in
107		107
108	(start)	108	(start)
109	_arguments \	109	_arguments \
110	-F'[Fetch from origin before performing finish]'\	110	-F'[Fetch from origin before performing finish]'\
111	':version:__git_flow_version_list'	111	':version:__git_flow_version_list'
112	;;	112	;;
113		113
114	(finish)	114	(finish)
115	_arguments \	115	_arguments \
116	-F'[Fetch from origin before performing finish]' \	116	-F'[Fetch from origin before performing finish]' \
117	-s'[Sign the release tag cryptographically]'\	117	-s'[Sign the release tag cryptographically]'\
118	-u'[Use the given GPG-key for the digital signature (implies -s)]'\	118	-u'[Use the given GPG-key for the digital signature (implies -s)]'\
119	-m'[Use the given tag message]'\	119	-m'[Use the given tag message]'\
120	-p'[Push to $ORIGIN after performing finish]'\	120	-p'[Push to $ORIGIN after performing finish]'\
121	-k'[Keep branch after performing finish]'\	121	-k'[Keep branch after performing finish]'\
122	-n"[Don't tag this release]"\	122	-n"[Don't tag this release]"\
123	':version:__git_flow_version_list'	123	':version:__git_flow_version_list'
124	;;	124	;;
125		125
126	(publish)	126	(publish)
127	_arguments \	127	_arguments \
128	':version:__git_flow_version_list'\	128	':version:__git_flow_version_list'\
129	;;	129	;;
130		130
131	(track)	131	(track)
132	_arguments \	132	_arguments \
133	':version:__git_flow_version_list'\	133	':version:__git_flow_version_list'\
134	;;	134	;;
135		135
136	*)	136	*)
137	_arguments \	137	_arguments \
138	-v'[Verbose (more) output]'	138	-v'[Verbose (more) output]'
139	;;	139	;;
140	esac	140	esac
141	;;	141	;;
142	esac	142	esac
143	}	143	}
144		144
145	__git-flow-hotfix ()	145	__git-flow-hotfix ()
146	{	146	{
147	local curcontext="$curcontext" state line	147	local curcontext="$curcontext" state line
148	typeset -A opt_args	148	typeset -A opt_args
149		149
150	_arguments -C \	150	_arguments -C \
151	':command:->command' \	151	':command:->command' \
152	'*::options:->options'	152	'*::options:->options'
153		153
154	case $state in	154	case $state in
155	(command)	155	(command)
156		156
157	local -a subcommands	157	local -a subcommands
158	subcommands=(	158	subcommands=(
159	'start:Start a new hotfix branch.'	159	'start:Start a new hotfix branch.'
160	'finish:Finish a hotfix branch.'	160	'finish:Finish a hotfix branch.'
161	'list:List all your hotfix branches. (Alias to `git flow hotfix`)'	161	'list:List all your hotfix branches. (Alias to `git flow hotfix`)'
162	)	162	)
163	_describe -t commands 'git flow hotfix' subcommands	163	_describe -t commands 'git flow hotfix' subcommands
164	_arguments \	164	_arguments \
165	-v'[Verbose (more) output]'	165	-v'[Verbose (more) output]'
166	;;	166	;;
167		167
168	(options)	168	(options)
169	case $line[1] in	169	case $line[1] in
170		170
171	(start)	171	(start)
172	_arguments \	172	_arguments \
173	-F'[Fetch from origin before performing finish]'\	173	-F'[Fetch from origin before performing finish]'\
174	':hotfix:__git_flow_version_list'\	174	':hotfix:__git_flow_version_list'\
175	':branch-name:__git_branch_names'	175	':branch-name:__git_branch_names'
176	;;	176	;;
177		177
178	(finish)	178	(finish)
179	_arguments \	179	_arguments \
180	-F'[Fetch from origin before performing finish]' \	180	-F'[Fetch from origin before performing finish]' \
181	-s'[Sign the release tag cryptographically]'\	181	-s'[Sign the release tag cryptographically]'\
182	-u'[Use the given GPG-key for the digital signature (implies -s)]'\	182	-u'[Use the given GPG-key for the digital signature (implies -s)]'\
183	-m'[Use the given tag message]'\	183	-m'[Use the given tag message]'\
184	-p'[Push to $ORIGIN after performing finish]'\	184	-p'[Push to $ORIGIN after performing finish]'\
185	-k'[Keep branch after performing finish]'\	185	-k'[Keep branch after performing finish]'\
186	-n"[Don't tag this release]"\	186	-n"[Don't tag this release]"\
187	':hotfix:__git_flow_hotfix_list'	187	':hotfix:__git_flow_hotfix_list'
188	;;	188	;;
189		189
190	*)	190	*)
191	_arguments \	191	_arguments \
192	-v'[Verbose (more) output]'	192	-v'[Verbose (more) output]'
193	;;	193	;;
194	esac	194	esac
195	;;	195	;;
196	esac	196	esac
197	}	197	}
198		198
199	__git-flow-feature ()	199	__git-flow-feature ()
200	{	200	{
201	local curcontext="$curcontext" state line	201	local curcontext="$curcontext" state line
202	typeset -A opt_args	202	typeset -A opt_args
203		203
204	_arguments -C \	204	_arguments -C \
205	':command:->command' \	205	':command:->command' \
206	'*::options:->options'	206	'*::options:->options'
207		207
208	case $state in	208	case $state in
209	(command)	209	(command)
210		210
211	local -a subcommands	211	local -a subcommands
212	subcommands=(	212	subcommands=(
213	'start:Start a new feature branch.'	213	'start:Start a new feature branch.'
214	'finish:Finish a feature branch.'	214	'finish:Finish a feature branch.'
215	'list:List all your feature branches. (Alias to `git flow feature`)'	215	'list:List all your feature branches. (Alias to `git flow feature`)'
216	'publish: publish'	216	'publish: publish'
217	'track: track'	217	'track: track'
218	'diff: diff'	218	'diff: diff'
219	'rebase: rebase'	219	'rebase: rebase'
220	'checkout: checkout'	220	'checkout: checkout'
221	'pull: pull'	221	'pull: pull'
222	)	222	)
223	_describe -t commands 'git flow feature' subcommands	223	_describe -t commands 'git flow feature' subcommands
224	_arguments \	224	_arguments \
225	-v'[Verbose (more) output]'	225	-v'[Verbose (more) output]'
226	;;	226	;;
227		227
228	(options)	228	(options)
229	case $line[1] in	229	case $line[1] in
230		230
231	(start)	231	(start)
232	_arguments \	232	_arguments \
233	-F'[Fetch from origin before performing finish]'\	233	-F'[Fetch from origin before performing finish]'\
234	':feature:__git_flow_feature_list'\	234	':feature:__git_flow_feature_list'\
235	':branch-name:__git_branch_names'	235	':branch-name:__git_branch_names'
236	;;	236	;;
237		237
238	(finish)	238	(finish)
239	_arguments \	239	_arguments \
240	-F'[Fetch from origin before performing finish]' \	240	-F'[Fetch from origin before performing finish]' \
241	-r'[Rebase instead of merge]'\	241	-r'[Rebase instead of merge]'\
242	-k'[Keep branch after performing finish]'\	242	-k'[Keep branch after performing finish]'\
243	':feature:__git_flow_feature_list'	243	':feature:__git_flow_feature_list'
244	;;	244	;;
245		245
246	(publish)	246	(publish)
247	_arguments \	247	_arguments \
248	':feature:__git_flow_feature_list'\	248	':feature:__git_flow_feature_list'\
249	;;	249	;;
250		250
251	(track)	251	(track)
252	_arguments \	252	_arguments \
253	':feature:__git_flow_feature_list'\	253	':feature:__git_flow_feature_list'\
254	;;	254	;;
255		255
256	(diff)	256	(diff)
257	_arguments \	257	_arguments \
258	':branch:__git_flow_feature_list'\	258	':branch:__git_flow_feature_list'\
259	;;	259	;;
260		260
261	(rebase)	261	(rebase)
262	_arguments \	262	_arguments \
263	-i'[Do an interactive rebase]' \	263	-i'[Do an interactive rebase]' \
264	':branch:__git_flow_feature_list'	264	':branch:__git_flow_feature_list'
265	;;	265	;;
266		266
267	(checkout)	267	(checkout)
268	_arguments \	268	_arguments \
269	':branch:__git_flow_feature_list'\	269	':branch:__git_flow_feature_list'\
270	;;	270	;;
271		271
272	(pull)	272	(pull)
273	_arguments \	273	_arguments \
274	':remote:__git_remotes'\	274	':remote:__git_remotes'\
275	':branch:__git_flow_feature_list'	275	':branch:__git_flow_feature_list'
276	;;	276	;;
277		277
278	*)	278	*)
279	_arguments \	279	_arguments \
280	-v'[Verbose (more) output]'	280	-v'[Verbose (more) output]'
281	;;	281	;;
282	esac	282	esac
283	;;	283	;;
284	esac	284	esac
285	}	285	}
286		286
287	__git_flow_version_list ()	287	__git_flow_version_list ()
288	{	288	{
289	local expl	289	local expl
290	declare -a versions	290	declare -a versions
291		291
292	versions=(${${(f)"$(_call_program versions git flow release list 2> /dev/null \| tr -d ' \|*')"}})	292	versions=(${${(f)"$(_call_program versions git flow release list 2> /dev/null \| tr -d ' \|*')"}})
293	__git_command_successful \|\| return	293	__git_command_successful \|\| return
294		294
295	_wanted versions expl 'version' compadd $versions	295	_wanted versions expl 'version' compadd $versions
296	}	296	}
297		297
298	__git_flow_feature_list ()	298	__git_flow_feature_list ()
299	{	299	{
300	local expl	300	local expl
301	declare -a features	301	declare -a features
302		302
303	features=(${${(f)"$(_call_program features git flow feature list 2> /dev/null \| tr -d ' \|*')"}})	303	features=(${${(f)"$(_call_program features git flow feature list 2> /dev/null \| tr -d ' \|*')"}})
304	__git_command_successful \|\| return	304	__git_command_successful \|\| return
305		305
306	_wanted features expl 'feature' compadd $features	306	_wanted features expl 'feature' compadd $features
307	}	307	}
308		308
309	__git_remotes () {	309	__git_remotes () {
310	local expl gitdir remotes	310	local expl gitdir remotes
311		311
312	gitdir=$(_call_program gitdir git rev-parse --git-dir 2>/dev/null)	312	gitdir=$(_call_program gitdir git rev-parse --git-dir 2>/dev/null)
313	__git_command_successful \|\| return	313	__git_command_successful \|\| return
314		314
315	remotes=(${${(f)"$(_call_program remotes git config --get-regexp '"^remote\..\.url$"')"}//#(#b)remote.().url */$match[1]})	315	remotes=(${${(f)"$(_call_program remotes git config --get-regexp '"^remote\..\.url$"')"}//#(#b)remote.().url */$match[1]})
316	__git_command_successful \|\| return	316	__git_command_successful \|\| return
317		317
318	# TODO: Should combine the two instead of either or.	318	# TODO: Should combine the two instead of either or.
319	if (( $#remotes > 0 )); then	319	if (( $#remotes > 0 )); then
320	_wanted remotes expl remote compadd $* - $remotes	320	_wanted remotes expl remote compadd $* - $remotes
321	else	321	else
322	_wanted remotes expl remote _files $* - -W "($gitdir/remotes)" -g "$gitdir/remotes/*"	322	_wanted remotes expl remote _files $* - -W "($gitdir/remotes)" -g "$gitdir/remotes/*"
323	fi	323	fi
324	}	324	}
325		325
326	__git_flow_hotfix_list ()	326	__git_flow_hotfix_list ()
327	{	327	{
328	local expl	328	local expl
329	declare -a hotfixes	329	declare -a hotfixes
330		330
331	hotfixes=(${${(f)"$(_call_program hotfixes git flow hotfix list 2> /dev/null \| tr -d ' \|*')"}})	331	hotfixes=(${${(f)"$(_call_program hotfixes git flow hotfix list 2> /dev/null \| tr -d ' \|*')"}})
332	__git_command_successful \|\| return	332	__git_command_successful \|\| return
333		333
334	_wanted hotfixes expl 'hotfix' compadd $hotfixes	334	_wanted hotfixes expl 'hotfix' compadd $hotfixes
335	}	335	}
336		336
337	__git_branch_names () {	337	__git_branch_names () {
338	local expl	338	local expl
339	declare -a branch_names	339	declare -a branch_names
340		340
341	branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads 2>/dev/null)"}#refs/heads/})	341	branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads 2>/dev/null)"}#refs/heads/})
342	__git_command_successful \|\| return	342	__git_command_successful \|\| return
343		343
344	_wanted branch-names expl branch-name compadd $* - $branch_names	344	_wanted branch-names expl branch-name compadd $* - $branch_names
345	}	345	}
346		346
347	__git_command_successful () {	347	__git_command_successful () {
348	if (( ${#pipestatus:#0} > 0 )); then	348	if (( ${#pipestatus:#0} > 0 )); then
349	_message 'not a git repository'	349	_message 'not a git repository'
350	return 1	350	return 1
351	fi	351	fi
352	return 0	352	return 0
353	}	353	}
354		354
355	zstyle ':completion:::git:*' user-commands flow:'description for foo'	355	zstyle ':completion:::git:*' user-commands flow:'description for foo'
356		356

plugins/git/git.plugin.zsh

Diff comments View file @ 61aaa7b

 # Query/use custom command for `git`.
 zstyle -s ":vcs_info:git:*:-all-" "command" _omz_git_git_cmd
 : ${_omz_git_git_cmd:=git}
 #
 # Functions
 #
-# The current branch name
+# The name of the current branch
-# Usage example: git pull origin $(current_branch)
+# Back-compatibility wrapper for when this function was defined here in
-# Using '--quiet' with 'symbolic-ref' will not cause a fatal error (128) if
+# the plugin, before being pulled in to core lib/git.zsh as git_current_branch()
-# it's not a symbolic ref, but in a Git repo.
+# to fix the core -> git plugin dependency.
 function current_branch() {
-  local ref
+  git_current_branch
-  ref=$($_omz_git_git_cmd symbolic-ref --quiet HEAD 2> /dev/null)
-  local ret=$?
-  if [[ $ret != 0 ]]; then
-    [[ $ret == 128 ]] && return  # no git repo.
-    ref=$($_omz_git_git_cmd rev-parse --short HEAD 2> /dev/null) || return
-  fi
-  echo ${ref#refs/heads/}
 }
 # The list of remotes
 function current_repository() {
   if ! $_omz_git_git_cmd rev-parse --is-inside-work-tree &> /dev/null; then
     return
   fi
   echo $($_omz_git_git_cmd remote -v | cut -d':' -f 2)
 }
 # Pretty log messages
 function _git_log_prettily(){
   if ! [ -z $1 ]; then
     git log --pretty=$1
   fi
 }
 # Warn if the current branch is a WIP
 function work_in_progress() {
   if $(git log -n 1 2>/dev/null | grep -q -c "\-\-wip\-\-"); then
     echo "WIP!!"
   fi
 }
 #
 # Aliases
 # (sorted alphabetically)
 #
 alias g='git'
 alias ga='git add'
 alias gaa='git add --all'
 alias gapa='git add --patch'
 alias gb='git branch'
 alias gba='git branch -a'
 alias gbda='git branch --merged | command grep -vE "^(\*|\s*master\s*$)" | command xargs -n 1 git branch -d'
 alias gbl='git blame -b -w'
 alias gbnm='git branch --no-merged'
 alias gbr='git branch --remote'
 alias gbs='git bisect'
 alias gbsb='git bisect bad'
 alias gbsg='git bisect good'
 alias gbsr='git bisect reset'
 alias gbss='git bisect start'
 alias gc='git commit -v'
 alias gc!='git commit -v --amend'
 alias gca='git commit -v -a'
 alias gca!='git commit -v -a --amend'
 alias gcan!='git commit -v -a -s --no-edit --amend'
 alias gcam='git commit -a -m'
 alias gcb='git checkout -b'
 alias gcf='git config --list'
 alias gcl='git clone --recursive'
 alias gclean='git clean -fd'
 alias gpristine='git reset --hard && git clean -dfx'
 alias gcm='git checkout master'
 alias gcmsg='git commit -m'
 alias gco='git checkout'
 alias gcount='git shortlog -sn'
 compdef gcount=git
 alias gcp='git cherry-pick'
 alias gcs='git commit -S'
 alias gd='git diff'
 alias gdca='git diff --cached'
 alias gdct='git describe --tags `git rev-list --tags --max-count=1`'
 alias gdt='git diff-tree --no-commit-id --name-only -r'
 gdv() { git diff -w "$@" | view - }
 compdef _git gdv=git-diff
 alias gdw='git diff --word-diff'
 alias gf='git fetch'
 alias gfa='git fetch --all --prune'
 function gfg() { git ls-files | grep $@ }
 compdef gfg=grep
 alias gfo='git fetch origin'
 alias gg='git gui citool'
 alias gga='git gui citool --amend'
 ggf() {
-[[ "$#" != 1 ]] && local b="$(current_branch)"
+[[ "$#" != 1 ]] && local b="$(git_current_branch)"
 git push --force origin "${b:=$1}"
 }
 compdef _git ggf=git-checkout
 ggl() {
 if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then
 git pull origin "${*}"
 else
-[[ "$#" == 0 ]] && local b="$(current_branch)"
+[[ "$#" == 0 ]] && local b="$(git_current_branch)"
 git pull origin "${b:=$1}"
 fi
 }
 compdef _git ggl=git-checkout
-alias ggpull='git pull origin $(current_branch)'
+alias ggpull='git pull origin $(git_current_branch)'
 compdef _git ggpull=git-checkout
 ggp() {
 if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then
 git push origin "${*}"
 else
-[[ "$#" == 0 ]] && local b="$(current_branch)"
+[[ "$#" == 0 ]] && local b="$(git_current_branch)"
 git push origin "${b:=$1}"
 fi
 }
 compdef _git ggp=git-checkout
-alias ggpush='git push origin $(current_branch)'
+alias ggpush='git push origin $(git_current_branch)'
 compdef _git ggpush=git-checkout
 ggpnp() {
 if [[ "$#" == 0 ]]; then
 ggl && ggp
 else
 ggl "${*}" && ggp "${*}"
 fi
 }
 compdef _git ggpnp=git-checkout
-alias ggsup='git branch --set-upstream-to=origin/$(current_branch)'
+alias ggsup='git branch --set-upstream-to=origin/$(git_current_branch)'
 ggu() {
-[[ "$#" != 1 ]] && local b="$(current_branch)"
+[[ "$#" != 1 ]] && local b="$(git_current_branch)"
 git pull --rebase origin "${b:=$1}"
 }
 compdef _git ggu=git-checkout
 alias ggpur='ggu'
 compdef _git ggpur=git-checkout
 alias gignore='git update-index --assume-unchanged'
 alias gignored='git ls-files -v | grep "^[[:lower:]]"'
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
 compdef git-svn-dcommit-push=git
 alias gk='\gitk --all --branches'
 compdef _git gk='gitk'
 alias gke='\gitk --all $(git log -g --pretty=format:%h)'
 compdef _git gke='gitk'
 alias gl='git pull'
 alias glg='git log --stat --color'
 alias glgp='git log --stat --color -p'
 alias glgg='git log --graph --color'
 alias glgga='git log --graph --decorate --all'
 alias glgm='git log --graph --max-count=10'
 alias glo='git log --oneline --decorate --color'
 alias glol="git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"
 alias glola="git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --all"
 alias glog='git log --oneline --decorate --color --graph'
 alias glp="_git_log_prettily"
 compdef _git glp=git-log
 alias gm='git merge'
 alias gmom='git merge origin/master'
 alias gmt='git mergetool --no-prompt'
 alias gmtvim='git mergetool --no-prompt --tool=vimdiff'
 alias gmum='git merge upstream/master'
 alias gp='git push'
 alias gpd='git push --dry-run'
 alias gpoat='git push origin --all && git push origin --tags'
 compdef _git gpoat=git-push
 alias gpu='git push upstream'
 alias gpv='git push -v'
 alias gr='git remote'
 alias gra='git remote add'
 alias grb='git rebase'
 alias grba='git rebase --abort'
 alias grbc='git rebase --continue'
 alias grbi='git rebase -i'
 alias grbm='git rebase master'
 alias grbs='git rebase --skip'
 alias grh='git reset HEAD'
 alias grhh='git reset HEAD --hard'
 alias grmv='git remote rename'
 alias grrm='git remote remove'
 alias grset='git remote set-url'
 alias grt='cd $(git rev-parse --show-toplevel || echo ".")'
 alias gru='git reset --'
 alias grup='git remote update'
 alias grv='git remote -v'
 alias gsb='git status -sb'
 alias gsd='git svn dcommit'
 alias gsi='git submodule init'
 alias gsps='git show --pretty=short --show-signature'
 alias gsr='git svn rebase'
 alias gss='git status -s'
 alias gst='git status'
 alias gsta='git stash'
 alias gstaa='git stash apply'
 alias gstd='git stash drop'
 alias gstl='git stash list'
 alias gstp='git stash pop'
 alias gsts='git stash show --text'
 alias gsu='git submodule update'
 alias gts='git tag -s'
 alias gtv='git tag | sort -V'
 alias gunignore='git update-index --no-assume-unchanged'
 alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
 alias gup='git pull --rebase'
 alias gupv='git pull --rebase -v'
 alias glum='git pull upstream master'
 alias gvt='git verify-tag'
 alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
 alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit -m "--wip--"'

plugins/github/_hub

Diff comments View file @ 61aaa7b

File was created	1	#compdef hub
	2
	3	# Zsh will source this file when attempting to autoload the "_hub" function,
	4	# typically on the first attempt to complete the hub command. We define two new
	5	# setup helper routines (one for the zsh-distributed version, one for the
	6	# git-distributed, bash-based version). Then we redefine the "_hub" function to
	7	# call "_git" after some other interception.
	8	#
	9	# This is pretty fragile, if you think about it. Any number of implementation
	10	# changes in the "_git" scripts could cause problems down the road. It would be
	11	# better if the stock git completions were just a bit more permissive about how
	12	# it allowed third-party commands to be added.
	13
	14	(( $+functions[__hub_setup_zsh_fns] )) \|\|
	15	__hub_setup_zsh_fns () {
	16	(( $+functions[_git-alias] )) \|\|
	17	_git-alias () {
	18	_arguments \
	19	'-s[output shell script suitable for eval]' \
	20	'1::shell:(zsh bash csh)'
	21	}
	22
	23	(( $+functions[_git-browse] )) \|\|
	24	_git-browse () {
	25	_arguments \
	26	'-u[output the URL]' \
	27	'2::subpage:(wiki commits issues)'
	28	}
	29
	30	(( $+functions[_git-compare] )) \|\|
	31	_git-compare () {
	32	_arguments \
	33	'-u[output the URL]' \
	34	':[start...]end range:'
	35	}
	36
	37	(( $+functions[_git-create] )) \|\|
	38	_git-create () {
	39	_arguments \
	40	'::name (REPOSITORY or ORGANIZATION/REPOSITORY):' \
	41	'-p[make repository private]' \
	42	'-d[description]:description' \
	43	'-h[home page]:repository home page URL:_urls'
	44	}
	45
	46	(( $+functions[_git-fork] )) \|\|
	47	_git-fork () {
	48	_arguments \
	49	'--no-remote[do not add a remote for the new fork]'
	50	}
	51
	52	(( $+functions[_git-pull-request] )) \|\|
	53	_git-pull-request () {
	54	_arguments \
	55	'-f[force (skip check for local commits)]' \
	56	'-b[base]:base ("branch", "owner\:branch", "owner/repo\:branch"):' \
	57	'-h[head]:head ("branch", "owner\:branch", "owner/repo\:branch"):' \
	58	- set1 \
	59	'-m[message]' \
	60	'-F[file]' \
	61	'-a[user]' \
	62	'-M[milestone]' \
	63	'-l[labels]' \
	64	- set2 \
	65	'-i[issue]:issue number:' \
	66	- set3 \
	67	'::issue-url:_urls'
	68	}
	69
	70	# stash the "real" command for later
	71	functions[_hub_orig_git_commands]=$functions[_git_commands]
	72
	73	# Replace it with our own wrapper.
	74	declare -f _git_commands >& /dev/null && unfunction _git_commands
	75	_git_commands () {
	76	local ret=1
	77	# call the original routine
	78	_call_function ret _hub_orig_git_commands
	79
	80	# Effectively "append" our hub commands to the behavior of the original
	81	# _git_commands function. Using this wrapper function approach ensures
	82	# that we only offer the user the hub subcommands when the user is
	83	# actually trying to complete subcommands.
	84	hub_commands=(
	85	alias:'show shell instructions for wrapping git'
	86	pull-request:'open a pull request on GitHub'
	87	fork:'fork origin repo on GitHub'
	88	create:'create new repo on GitHub for the current project'
	89	browse:'browse the project on GitHub'
	90	compare:'open GitHub compare view'
	91	ci-status:'lookup commit in GitHub Status API'
	92	)
	93	_describe -t hub-commands 'hub command' hub_commands && ret=0
	94
	95	return ret
	96	}
	97	}
	98
	99	(( $+functions[__hub_setup_bash_fns] )) \|\|
	100	__hub_setup_bash_fns () {
	101	# TODO more bash-style fns needed here to complete subcommand args. They take
	102	# the form "_git_CMD" where "CMD" is something like "pull-request".
	103
	104	# Duplicate and rename the 'list_all_commands' function
	105	eval "$(declare -f __git_list_all_commands \| \
	106	sed 's/__git_list_all_commands/__git_list_all_commands_without_hub/')"
	107
	108	# Wrap the 'list_all_commands' function with extra hub commands
	109	__git_list_all_commands() {
	110	cat <<-EOF
	111	alias
	112	pull-request
	113	fork
	114	create
	115	browse
	116	compare
	117	ci-status
	118	EOF
	119	__git_list_all_commands_without_hub
	120	}
	121
	122	# Ensure cached commands are cleared
	123	__git_all_commands=""
	124	}
	125
	126	# redefine _hub to a much smaller function in the steady state
	127	_hub () {
	128	# only attempt to intercept the normal "_git" helper functions once
	129	(( $+__hub_func_replacement_done )) \|\|
	130	() {
	131	# At this stage in the shell's execution the "_git" function has not yet
	132	# been autoloaded, so the "_git_commands" or "__git_list_all_commands"
	133	# functions will not be defined. Call it now (with a bogus no-op service
	134	# to prevent premature completion) so that we can wrap them.
	135	if declare -f _git >& /dev/null ; then
	136	_hub_noop () { __hub_zsh_provided=1 } # zsh-provided will call this one
	137	__hub_noop_main () { __hub_git_provided=1 } # git-provided will call this one
	138	local service=hub_noop
	139	_git
	140	unfunction _hub_noop
	141	unfunction __hub_noop_main
	142	service=git
	143	fi
	144
	145	if (( $__hub_zsh_provided )) ; then
	146	__hub_setup_zsh_fns
	147	elif (( $__hub_git_provided )) ; then
	148	__hub_setup_bash_fns
	149	fi
	150
	151	__hub_func_replacement_done=1
	152	}
	153
	154	# Now perform the actual completion, allowing the "_git" function to call our
	155	# replacement "_git_commands" function as needed. Both versions expect
	156	# service=git or they will call nonexistent routines or end up in an infinite
	157	# loop.
	158	service=git
	159	declare -f _git >& /dev/null && _git
	160	}
	161
	162	# make sure we actually attempt to complete on the first "tab" from the user
	163	_hub
	164

plugins/gulp/gulp.plugin.zsh

Diff comments View file @ 61aaa7b

1	#!/usr/bin/env zsh	1	#!/usr/bin/env zsh
2		2
3	#	3	#
4	# gulp-autocompletion-zsh	4	# gulp-autocompletion-zsh
5	#	5	#
6	# Autocompletion for your gulp.js tasks	6	# Autocompletion for your gulp.js tasks
7	#	7	#
8	# Copyright(c) 2014 André König <andre.koenig@posteo.de>	8	# Copyright(c) 2014 André König <andre.koenig@posteo.de>
9	# MIT Licensed	9	# MIT Licensed
10	#	10	#
11		11
12	#	12	#
13	# André König	13	# André König
14	# Github: https://github.com/akoenig	14	# Github: https://github.com/akoenig
15	# Twitter: https://twitter.com/caiifr	15	# Twitter: https://twitter.com/caiifr
16	#	16	#
17		17
18	#	18	#
19	# Grabs all available tasks from the `gulpfile.js`	19	# Grabs all available tasks from the `gulpfile.js`
20	# in the current directory.	20	# in the current directory.
21	#	21	#
22	function $$gulp_completion {	22	function $$gulp_completion {
23	compls="$(grep -Eo "gulp.task\((['\"](([a-zA-Z0-9]\|-))['\"],)" gulpfile.js 2>/dev/null \| grep -Eo "['\"](([a-zA-Z0-9]\|-))['\"]" \| sed s/"['\"]"//g \| sort)"	23	compls=$(gulp --tasks-simple 2>/dev/null)
24		24
25	completions=(${=compls})	25	completions=(${=compls})
26	compadd -- $completions	26	compadd -- $completions
27	}	27	}
28		28
29	compdef $$gulp_completion gulp	29	compdef $$gulp_completion gulp
30		30

plugins/history-substring-search/history-substring-search.plugin.zsh

Diff comments View file @ 61aaa7b

plugins/history-substring-search/update-from-upstream.zsh

Diff comments View file @ 61aaa7b

 #!/usr/bin/env zsh
 #
 # update-from-upstream.zsh
 #
 # This script updates the Oh My Zsh version of the zsh-history-substring-search
 # plugin from the independent upstream repo. This is to be run by OMZ developers
 # when they want to pull in new changes from upstream to OMZ. It is not run
 # during normal use of the plugin.
 #
 # The official upstream repo is zsh-users/zsh-history-substring-search
 # https://github.com/zsh-users/zsh-history-substring-search
 #
 # This is a zsh script, not a function. Call it with `zsh update-from-upstream.zsh`
 # from the command line, running it from within the plugin directory.
 #
 # You can set the environment variable REPO_PATH to point it at an upstream
 # repo you have already prepared. Otherwise, it will do a clean checkout of
 # upstream's HEAD to a temporary local repo and use that.
 # Just bail on any error so we don't have to do extra checking.
 # This is a developer-use script, so terse output like that should
 # be fine.
 set -e
 upstream_basename=zsh-history-substring-search
 plugin_basename=history-substring-search
 UPSTREAM_REPO=zsh-users/$upstream_basename
 need_repo_cleanup=false
 upstream_github_url="https://github.com/$UPSTREAM_REPO"
 if [[ -z "$UPSTREAM_REPO_PATH" ]]; then
   # Do a clean checkout
   my_tempdir=$(mktemp -d -t omz-update-histsubstrsrch)
   UPSTREAM_REPO_PATH="$my_tempdir/$upstream_basename"
   git clone "$upstream_github_url" "$UPSTREAM_REPO_PATH"
   need_repo_cleanup=true
   print "Checked out upstream repo to $UPSTREAM_REPO_PATH"
 else
 	print "Using existing $upstream_basename repo at $UPSTREAM_REPO_PATH"
 fi
 upstream="$UPSTREAM_REPO_PATH"
 # Figure out what we're pulling in
 upstream_sha=$(cd $upstream && git rev-parse HEAD)
 upstream_commit_date=$(cd $upstream && git log  -1 --pretty=format:%ci)
 upstream_just_date=${${=upstream_commit_date}[1]}
 print "upstream SHA:         $upstream_sha"
 print "upstream commit time: $upstream_commit_date"
 print "upstream commit date: $upstream_just_date"
 print
 # Copy the files over, using the OMZ plugin's names where needed
 cp -v "$upstream"/* .
 mv -v zsh-history-substring-search.zsh $plugin_basename.zsh
 mv -v zsh-history-substring-search.plugin.zsh $plugin_basename.plugin.zsh
 if [[ $need_repo_cleanup == true ]]; then
 	print "Removing temporary repo at $my_tempdir"
 	rm -rf "$my_tempdir"
 fi
 # Do OMZ-specific edits
 print
 print "Updating files with OMZ-specific stuff"
 print
 # OMZ binds the keys as part of the plugin loading
 cat >> $plugin_basename.plugin.zsh <<EOF
 # Bind terminal-specific up and down keys
 if [[ -n "\$terminfo[kcuu1]" ]]; then
-  bindkey "\$terminfo[kcuu1]" history-substring-search-up
+  bindkey -M emacs "\$terminfo[kcuu1]" history-substring-search-up
+  bindkey -M viins "\$terminfo[kcuu1]" history-substring-search-up
 fi
 if [[ -n "\$terminfo[kcud1]" ]]; then
-  bindkey "\$terminfo[kcud1]" history-substring-search-down
+  bindkey -M emacs "\$terminfo[kcud1]" history-substring-search-down
+  bindkey -M viins "\$terminfo[kcud1]" history-substring-search-down
 fi
 EOF
 # Tack OMZ-specific notes on to readme
 thin_line="------------------------------------------------------------------------------"
 cat >> README.md <<EOF
 $thin_line
 Oh My Zsh Distribution Notes
 $thin_line
 What you are looking at now is Oh My Zsh's repackaging of zsh-history-substring-search
 as an OMZ module inside the Oh My Zsh distribution.
 The upstream repo, $UPSTREAM_REPO, can be found on GitHub at
 $upstream_github_url.
 This downstream copy was last updated from the following upstream commit:
   SHA:          $upstream_sha
   Commit date:  $upstream_commit_date
 Everything above this section is a copy of the original upstream's README, so things
 may differ slightly when you're using this inside OMZ. In particular, you do not
 need to set up key bindings for the up and down arrows yourself in \`~/.zshrc\`; the OMZ
 plugin does that for you. You may still want to set up additional emacs- or vi-specific
 bindings as mentioned above.
 EOF
 # Announce success and generate git commit messages
 cat <<EOF
 Done OK
 Now you can check the results and commit like this:
   git add *
   git commit -m "history-substring-search: update to upstream version $upstream_just_date" \\
       -m "Updates OMZ's copy to commit $upstream_sha from $UPSTREAM_REPO"
 EOF

plugins/mercurial/mercurial.plugin.zsh

Diff comments View file @ 61aaa7b

 # Mercurial
 alias hgc='hg commit'
 alias hgb='hg branch'
 alias hgba='hg branches'
 alias hgbk='hg bookmarks'
 alias hgco='hg checkout'
 alias hgd='hg diff'
 alias hged='hg diffmerge'
 # pull and update
 alias hgi='hg incoming'
 alias hgl='hg pull -u'
 alias hglr='hg pull --rebase'
 alias hgo='hg outgoing'
 alias hgp='hg push'
 alias hgs='hg status'
 alias hgsl='hg log --limit 20 --template "{node|short} | {date|isodatesec} | {author|user}: {desc|strip|firstline}\n" '
-# this is the 'git commit --amend' equivalent
+alias hgca='hg commit --amend'
-alias hgca='hg qimport -r tip ; hg qrefresh -e ; hg qfinish tip'
 # list unresolved files (since hg does not list unmerged files in the status command)
 alias hgun='hg resolve --list'
 function in_hg() {
   if [[ -d .hg ]] || $(hg summary > /dev/null 2>&1); then
     echo 1
   fi
 }
 function hg_get_branch_name() {
   if [ $(in_hg) ]; then
     echo $(hg branch)
   fi
 }
 function hg_prompt_info {
   if [ $(in_hg) ]; then
     _DISPLAY=$(hg_get_branch_name)
     echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_HG_PROMPT_PREFIX\
 $ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_PROMPT_BASE_COLOR$(hg_dirty)$ZSH_THEME_HG_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR"
     unset _DISPLAY
   fi
 }
 function hg_dirty_choose {
   if [ $(in_hg) ]; then
     hg status 2> /dev/null | command grep -Eq '^\s*[ACDIM!?L]'
     if [ $pipestatus[-1] -eq 0 ]; then
       # Grep exits with 0 when "One or more lines were selected", return "dirty".
       echo $1
     else
       # Otherwise, no lines were found, or an error occurred. Return clean.
       echo $2
     fi
   fi
 }
 function hg_dirty {
   hg_dirty_choose $ZSH_THEME_HG_PROMPT_DIRTY $ZSH_THEME_HG_PROMPT_CLEAN
 }
 function hgic() {
     hg incoming "$@" | grep "changeset" | wc -l
 }
 function hgoc() {
     hg outgoing "$@" | grep "changeset" | wc -l
 }

plugins/rails/rails.plugin.zsh

Diff comments View file @ 61aaa7b

 function _rails_command () {
   if [ -e "bin/rails" ]; then
     bin/rails $@
   elif [ -e "script/rails" ]; then
     ruby script/rails $@
   elif [ -e "script/server" ]; then
     ruby script/$@
   else
     command rails $@
   fi
 }
 function _rake_command () {
   if [ -e "bin/rake" ]; then
     bin/rake $@
   else
     command rake $@
   fi
 }
 alias rails='_rails_command'
 compdef _rails_command=rails
 alias rake='_rake_command'
 compdef _rake_command=rake
 alias devlog='tail -f log/development.log'
 alias prodlog='tail -f log/production.log'
 alias testlog='tail -f log/test.log'
 alias -g RED='RAILS_ENV=development'
 alias -g REP='RAILS_ENV=production'
 alias -g RET='RAILS_ENV=test'
 # Rails aliases
 alias rc='rails console'
 alias rd='rails destroy'
 alias rdb='rails dbconsole'
 alias rg='rails generate'
 alias rgm='rails generate migration'
 alias rp='rails plugin'
 alias ru='rails runner'
 alias rs='rails server'
 alias rsd='rails server --debugger'
 alias rsp='rails server --port'
 # Rake aliases
 alias rdm='rake db:migrate'
 alias rdms='rake db:migrate:status'
 alias rdr='rake db:rollback'
 alias rdc='rake db:create'
 alias rds='rake db:seed'
 alias rdd='rake db:drop'
 alias rdrs='rake db:reset'
 alias rdtc='rake db:test:clone'
 alias rdtp='rake db:test:prepare'
 alias rdmtc='rake db:migrate db:test:clone'
 alias rlc='rake log:clear'
 alias rn='rake notes'
 alias rr='rake routes'
 alias rrg='rake routes | grep'
 alias rt='rake test'
 alias rmd='rake middleware'
+alias rsts='rake stats'
 # legacy stuff
 alias sstat='thin --stats "/thin/stats" start'
 alias sg='ruby script/generate'
 alias sd='ruby script/destroy'
 alias sp='ruby script/plugin'
 alias sr='ruby script/runner'
 alias ssp='ruby script/spec'
 alias sc='ruby script/console'
 alias sd='ruby script/server --debugger'
 function remote_console() {
   /usr/bin/env ssh $1 "( cd $2 && ruby script/console production )"
 }

plugins/web-search/web-search.plugin.zsh

Diff comments View file @ 61aaa7b

 # web_search from terminal
 function web_search() {
   emulate -L zsh
   # define search engine URLS
   typeset -A urls
   urls=(
     google      "https://www.google.com/search?q="
     bing        "https://www.bing.com/search?q="
     yahoo       "https://search.yahoo.com/search?p="
     duckduckgo  "https://www.duckduckgo.com/?q="
     yandex      "https://yandex.ru/yandsearch?text="
     github      "https://github.com/search?q="
     baidu       "https://www.baidu.com/s?wd="
+    ecosia      "https://www.ecosia.org/search?q="
   )
   # check whether the search engine is supported
   if [[ -z "$urls[$1]" ]]; then
     echo "Search engine $1 not supported."
     return 1
   fi
   # search or go to main page depending on number of arguments passed
   if [[ $# -gt 1 ]]; then
     # build search url:
     # join arguments passed with '+', then append to search engine URL
     url="${urls[$1]}${(j:+:)@[2,-1]}"
   else
     # build main page url:
     # split by '/', then rejoin protocol (1) and domain (2) parts with '//'
     url="${(j://:)${(s:/:)urls[$1]}[1,2]}"
   fi
   open_command "$url"
 }
 alias bing='web_search bing'
 alias google='web_search google'
 alias yahoo='web_search yahoo'
 alias ddg='web_search duckduckgo'
 alias yandex='web_search yandex'
 alias github='web_search github'
 alias baidu='web_search baidu'
+alias ecosia='web_search ecosia'
 #add your own !bang searches here
 alias wiki='web_search duckduckgo \!w'
 alias news='web_search duckduckgo \!n'
 alias youtube='web_search duckduckgo \!yt'
 alias map='web_search duckduckgo \!m'
 alias image='web_search duckduckgo \!i'
 alias ducky='web_search duckduckgo \!'

plugins/zsh-navigation-tools/README.md

Diff comments View file @ 61aaa7b

 # Zsh Navigation Tools
 http://imageshack.com/a/img633/7967/ps6rKR.png
 Set of tools like n-history – multi-word history searcher, n-cd – directory
 bookmark manager, n-kill – htop like kill utility, and more. Based on
 n-list, a tool generating selectable curses-based list of elements that has
 access to current Zsh session, i.e. has broad capabilities to work together
 with it. Feature highlights include incremental multi-word searching, ANSI
 coloring, unique mode, horizontal scroll, non-selectable elements, grepping and
 various integrations with Zsh.
 ## History Widget
 To have n-history as multi-word incremental searcher bound to Ctrl-R copy znt-*
 files into the */site-functions dir (unless you use Oh My Zsh) and
 add:
     autoload znt-history-widget
     zle -N znt-history-widget
     bindkey "^R" znt-history-widget
 to .zshrc. This is done automatically when using Oh My Zsh. Two other
 widgets exist, znt-cd-widget and znt-kill-widget, they can be too assigned
 to key combinations (no need for autoload when using Oh My Zsh):
     zle -N znt-cd-widget
     bindkey "^T" znt-cd-widget
     zle -N znt-kill-widget
     bindkey "^Y" znt-kill-widget
 Oh My Zsh stores history into ~/.zsh_history. When you switch to OMZ you could
 want to copy your previous data (from e.g. ~/.zhistory) into the new location.
 ## Introduction
 The tools are:
 - n-aliases - browses aliases, relegates editing to vared
 - n-cd - browses dirstack and bookmarked directories, allows to enter selected directory
 - n-functions - browses functions, relegates editing to zed or vared
 - n-history - browses history, allows to edit and run commands from it
 - n-kill - browses processes list, allows to send signal to selected process
 - n-env - browses environment, relegates editing to vared
 - n-options - browses options, allows to toggle their state
 - n-panelize - loads output of given command into the list for browsing
 All tools support horizontal scroll with <,>, {,}, h,l or left and right
 cursors. Other keys are:
 - [,] - jump directory bookmarks in n-cd and typical signals in n-kill
 - Ctrl-d, Ctrl-u - half page up or down
 - Ctrl-p, Ctrl-n - previous and next (also done with vim's j,k)
 - Ctrl-l - redraw of whole display
 - g, G - beginning and end of the list
 - Ctrl-o, o - enter uniq mode (no duplicate lines)
 - / - start incremental search
 - Enter - finish incremental search, retaining filter
 - Esc - exit incremental search, clearing filter
 - Ctrl-w (in incremental search) - delete whole word
 - Ctrl-k (in incremental search) - delete whole line
 ## Programming
 The function n-list is used as follows:
     n-list {element1} [element2] ... [elementN]
 This is all that is needed to be done to have the features like ANSI coloring,
 incremental multi-word search, unique mode, horizontal scroll, non-selectable
 elements (grepping is done outside n-list, see the tools for how it can be
 done). To set up non-selectable entries add their indices into array
 NLIST_NONSELECTABLE_ELEMENTS:
     typeset -a NLIST_NONSELECTABLE_ELEMENTS
     NLIST_NONSELECTABLE_ELEMENTS=( 1 )
 Result is stored as $reply[REPLY] ($ isn't needed before REPLY because
 of arithmetic context inside []). The returned array might be different from
 input arguments as n-list can process them via incremental search or uniq
 mode. $REPLY is the index in that possibly processed array. If $REPLY
 equals -1 it means that no selection have been made (user quitted via q
 key).
 To set up entries that can be jumped to with [,] keys add their indices to
 NLIST_HOP_INDEXES array:
     typeset -a NLIST_HOP_INDEXES
     NLIST_HOP_INDEXES=( 1 10 )
 n-list can automatically colorize entries according to a Zsh pattern.
 Following example will colorize all numbers with blue:
     local NLIST_COLORING_PATTERN="[0-9]##"
     local NLIST_COLORING_COLOR=$'\x1b[00;34m'
     local NLIST_COLORING_END_COLOR=$'\x1b[0m'
     local NLIST_COLORING_MATCH_MULTIPLE=1
     n-list "This is a number 123" "This line too has a number: 456"
 Blue is the default color, it doesn't have to be set. See zshexpn man page
 for more information on Zsh patterns. Briefly, comparing to regular
 expressions, (#s) is ^, (#e) is $, # is *, ## is +. Alternative
 will work when in parenthesis, i.e. (a|b). BTW by using this method you can
 colorize output of the tools, via their config files (check out e.g. n-cd.conf,
 it uses this).
 ## Performance
-ZNT are fastest with Zsh before 5.0.8 and starting from 5.2 (the version yet to
+ZNT are fastest with Zsh before 5.0.6 and starting from 5.2
-be released).
 vim:filetype=conf

plugins/zsh-navigation-tools/n-list

Diff comments View file @ 61aaa7b

 # $1, $2, ... - elements of the list
 # $NLIST_NONSELECTABLE_ELEMENTS - array of indexes (1-based) that cannot be selected
 # $REPLY is the output variable - contains index (1-based) or -1 when no selection
 #
 # Copy this file into /usr/share/zsh/site-functions/
 # and add 'autoload n-list` to .zshrc
 #
 # This function outputs a list of elements that can be
 # navigated with keyboard. Uses curses library
 emulate -LR zsh
 setopt typesetsilent extendedglob noshortloops
 _nlist_has_terminfo=0
 zmodload zsh/curses
 zmodload zsh/terminfo 2>/dev/null && _nlist_has_terminfo=1
 trap "REPLY=-2; reply=(); return" TERM INT QUIT
 trap "_nlist_exit" EXIT
 # Drawing and input
 autoload n-list-draw n-list-input
 # Cleanup before any exit
 _nlist_exit() {
     setopt localoptions
     setopt extendedglob
     [[ "$REPLY" = -(#c0,1)[0-9]## ]] || REPLY="-1"
     zcurses 2>/dev/null delwin inner
     zcurses 2>/dev/null delwin main
     zcurses 2>/dev/null refresh
     zcurses end
     _nlist_alternate_screen 0
     _nlist_cursor_visibility 1
     unset _nlist_has_terminfo
 }
 # Outputs a message in the bottom of the screen
 _nlist_status_msg() {
     # -1 for border, -1 for 0-based indexing
     zcurses move main $(( term_height - 1 - 1 )) 2
     zcurses clear main eol
     zcurses string main "$1"
     #status_msg_strlen is localized in caller
     status_msg_strlen=$#1
 }
 # Prefer tput, then module terminfo
 _nlist_cursor_visibility() {
     if type tput 2>/dev/null 1>&2; then
         [ "$1" = "1" ] && { tput cvvis; tput cnorm }
         [ "$1" = "0" ] && tput civis
     elif [ "$_nlist_has_terminfo" = "1" ]; then
         [ "$1" = "1" ] && { [ -n $terminfo[cvvis] ] && echo -n $terminfo[cvvis];
                            [ -n $terminfo[cnorm] ] && echo -n $terminfo[cnorm] }
         [ "$1" = "0" ] && [ -n $terminfo[civis] ] && echo -n $terminfo[civis]
     fi
 }
 # Reason for this function is that on some systems
 # smcup and rmcup are not knowing why left empty
 _nlist_alternate_screen() {
     [ "$_nlist_has_terminfo" -ne "1" ] && return
     [[ "$1" = "1" && -n "$terminfo[smcup]" ]] && return
     [[ "$1" = "0" && -n "$terminfo[rmcup]" ]] && return
     case "$TERM" in
         *rxvt*)
             [ "$1" = "1" ] && echo -n $'\x1b7\x1b[?47h'
             [ "$1" = "0" ] && echo -n $'\x1b[2J\x1b[?47l\x1b8'
             ;;
         *)
             [ "$1" = "1" ] && echo -n $'\x1b[?1049h'
             [ "$1" = "0" ] && echo -n $'\x1b[?1049l'
             # just to remember two other that work: $'\x1b7\x1b[r\x1b[?47h', $'\x1b[?47l\x1b8'
             ;;
     esac
 }
 _nlist_compute_user_vars_difference() {
         if [[ "${(t)NLIST_NONSELECTABLE_ELEMENTS}" != "array" &&
                 "${(t)NLIST_NONSELECTABLE_ELEMENTS}" != "array-local" ]]
         then
             last_element_difference=0
             current_difference=0
         else
             last_element_difference=$#NLIST_NONSELECTABLE_ELEMENTS
             current_difference=0
             local idx
             for idx in "${(n)NLIST_NONSELECTABLE_ELEMENTS[@]}"; do
                 [ "$idx" -le "$NLIST_CURRENT_IDX" ] && current_difference+=1 || break
             done
         fi
 }
 # List was processed, check if variables aren't off range
 _nlist_verify_vars() {
     [ "$NLIST_CURRENT_IDX" -gt "$last_element" ] && NLIST_CURRENT_IDX="$last_element"
     [[ "$NLIST_CURRENT_IDX" -eq 0 && "$last_element" -ne 0 ]] && NLIST_CURRENT_IDX=1
     (( NLIST_FROM_WHAT_IDX_LIST_IS_SHOWN=0+((NLIST_CURRENT_IDX-1)/page_height)*page_height+1 ))
 }
 # Compute the variables which are shown to the user
 _nlist_setup_user_vars() {
     if [ "$1" = "1" ]; then
         # Basic values when there are no non-selectables
         NLIST_USER_CURRENT_IDX="$NLIST_CURRENT_IDX"
         NLIST_USER_LAST_ELEMENT="$last_element"
     else
         _nlist_compute_user_vars_difference
         NLIST_USER_CURRENT_IDX=$(( NLIST_CURRENT_IDX - current_difference ))
         NLIST_USER_LAST_ELEMENT=$(( last_element - last_element_difference ))
     fi
 }
-_nlist_coloring_list_into_col_list() {
+_nlist_colorify_disp_list() {
     local col=$'\x1b[00;34m' reset=$'\x1b[0m'
     [ -n "$NLIST_COLORING_COLOR" ] && col="$NLIST_COLORING_COLOR"
     [ -n "$NLIST_COLORING_END_COLOR" ] && reset="$NLIST_COLORING_END_COLOR"
     if [ "$NLIST_COLORING_MATCH_MULTIPLE" -eq 1 ]; then
-        col_list=( "${(@)list//(#mi)$~NLIST_COLORING_PATTERN/$col${MATCH}$reset}" )
+        disp_list=( "${(@)disp_list//(#mi)$~NLIST_COLORING_PATTERN/$col${MATCH}$reset}" )
     else
-        col_list=( "${(@)list/(#mi)$~NLIST_COLORING_PATTERN/$col${MATCH}$reset}" )
+        disp_list=( "${(@)disp_list/(#mi)$~NLIST_COLORING_PATTERN/$col${MATCH}$reset}" )
     fi
 }
 #
 # Main code
 #
 # Check if there is proper input
 if [ "$#" -lt 1 ]; then
     echo "Usage: n-list element_1 ..."
     return 1
 fi
 REPLY="-1"
 typeset -ga reply
 reply=()
 integer term_height="$LINES"
 integer term_width="$COLUMNS"
 if [[ "$term_height" -lt 1 || "$term_width" -lt 1 ]]; then
     local stty_out=$( stty size )
     term_height="${stty_out% *}"
     term_width="${stty_out#* }"
 fi
 integer inner_height=term_height-3
 integer inner_width=term_width-3
 integer page_height=inner_height
 integer page_width=inner_width
-typeset -a list col_list disp_list
+typeset -a list disp_list
 integer last_element=$#
 local action
 local final_key
 integer selection
 integer last_element_difference=0
 integer current_difference=0
 local prev_search_buffer=""
 integer prev_uniq_mode=0
 integer prev_start_idx=-1
 # Ability to remember the list between calls
 if [[ -z "$NLIST_REMEMBER_STATE" || "$NLIST_REMEMBER_STATE" -eq 0 || "$NLIST_REMEMBER_STATE" -eq 2 ]]; then
     NLIST_FROM_WHAT_IDX_LIST_IS_SHOWN=1
     NLIST_CURRENT_IDX=1
     NLIST_IS_SEARCH_MODE=0
     NLIST_SEARCH_BUFFER=""
     NLIST_TEXT_OFFSET=0
     NLIST_IS_UNIQ_MODE=0
     # Zero - because it isn't known, unless we
     # confirm that first element is selectable
     NLIST_USER_CURRENT_IDX=0
     [[ ${NLIST_NONSELECTABLE_ELEMENTS[(r)1]} != 1 ]] && NLIST_USER_CURRENT_IDX=1
     NLIST_USER_LAST_ELEMENT=$(( last_element - $#NLIST_NONSELECTABLE_ELEMENTS ))
     # 2 is init once, then remember
     [ "$NLIST_REMEMBER_STATE" -eq 2 ] && NLIST_REMEMBER_STATE=1
 fi
 if [ "$NLIST_START_IN_SEARCH_MODE" -eq 1 ]; then
     NLIST_START_IN_SEARCH_MODE=0
     NLIST_IS_SEARCH_MODE=1
 fi
 if [ -n "$NLIST_SET_SEARCH_TO" ]; then
     NLIST_SEARCH_BUFFER="$NLIST_SET_SEARCH_TO"
     NLIST_SET_SEARCH_TO=""
 fi
 if [ "$NLIST_START_IN_UNIQ_MODE" -eq 1 ]; then
     NLIST_START_IN_UNIQ_MODE=0
     NLIST_IS_UNIQ_MODE=1
 fi
 _nlist_alternate_screen 1
 zcurses init
 zcurses delwin main 2>/dev/null
 zcurses delwin inner 2>/dev/null
 zcurses addwin main "$term_height" "$term_width" 0 0
 zcurses addwin inner "$inner_height" "$inner_width" 1 2
 zcurses bg main white/black
 zcurses bg inner white/black
 if [ "$NLIST_IS_SEARCH_MODE" -ne 1 ]; then
     _nlist_cursor_visibility 0
 fi
 #
 # Listening for input
 #
 local key keypad
 # Clear input buffer
 zcurses timeout main 0
 zcurses input main key keypad
 zcurses timeout main -1
 key=""
 keypad=""
-list=( "$@" )
+# This loop makes script faster on some Zsh's (e.g. 5.0.8)
-last_element="$#list"
+repeat 1; do
+    list=( "$@" )
+done
-integer is_colored=0
+last_element="$#list"
-if [[ -z "$NLIST_SEARCH_BUFFER" && -n "$NLIST_COLORING_PATTERN" ]]; then
-    is_colored=1
-    _nlist_coloring_list_into_col_list
-fi
 while (( 1 )); do
     # Do searching (filtering with string)
     if [ -n "$NLIST_SEARCH_BUFFER" ]; then
-        # Compute new list, col_list ?
+        # Compute new list?
         if [[ "$NLIST_SEARCH_BUFFER" != "$prev_search_buffer" || "$NLIST_IS_UNIQ_MODE" -ne "$prev_uniq_mode" ]]; then
             prev_search_buffer="$NLIST_SEARCH_BUFFER"
             prev_uniq_mode="$NLIST_IS_UNIQ_MODE"
             # regenerating list -> regenerating disp_list
             prev_start_idx=-1
             # Take all elements, including duplicates and non-selectables
             typeset +U list
-            list=( "$@" )
+            repeat 1; do
+                list=( "$@" )
+            done
             # Remove non-selectable elements
             [ "$#NLIST_NONSELECTABLE_ELEMENTS" -gt 0 ] && for i in "${(nO)NLIST_NONSELECTABLE_ELEMENTS[@]}"; do
                 list[$i]=()
             done
             # Remove duplicates
             [ "$NLIST_IS_UNIQ_MODE" -eq 1 ] && typeset -U list
             last_element="$#list"
             # Next do the filtering
             local search_buffer="${NLIST_SEARCH_BUFFER%% ##}"
             search_buffer="${search_buffer## ##}"
             search_buffer="${search_buffer//(#m)[][*?|#~^()><\\]/\\$MATCH}"
             local search_pattern=""
             local colsearch_pattern=""
             if [ -n "$search_buffer" ]; then
                 # Patterns will be *foo*~^*bar* and foo|bar)
                 search_pattern="${search_buffer// ##/*~^*}"
                 colsearch_pattern="${search_buffer// ##/|}"
                 list=( "${(@M)list:#(#i)*$~search_pattern*}" )
                 last_element="$#list"
             fi
             # Called after processing list
             _nlist_verify_vars
         fi
         _nlist_setup_user_vars 1
         integer end_idx=$(( NLIST_FROM_WHAT_IDX_LIST_IS_SHOWN + page_height - 1 ))
         [ "$end_idx" -gt "$last_element" ] && end_idx=last_element
         if [ "$prev_start_idx" -ne "$NLIST_FROM_WHAT_IDX_LIST_IS_SHOWN" ]; then
             prev_start_idx="$NLIST_FROM_WHAT_IDX_LIST_IS_SHOWN"
             disp_list=( "${(@)list[NLIST_FROM_WHAT_IDX_LIST_IS_SHOWN, end_idx]}" )
             if [ -n "$colsearch_pattern" ]; then
                 local red=$'\x1b[00;31m' reset=$'\x1b[00;00m'
                 disp_list=( "${(@)disp_list//(#mi)($~colsearch_pattern)/$red${MATCH}$reset}" )
             fi
-            # We have display list, lets replace newlines with "\n" when needed (1/3)
+            # We have display list, lets replace newlines with "\n" when needed (1/2)
             [ "$NLIST_REPLACE_NEWLINES" -eq 1 ] && disp_list=( "${(@)disp_list//$'\n'/\\n}" )
         fi
         # Output colored list
         n-list-draw "$(( (NLIST_CURRENT_IDX-1) % page_height + 1 ))" \
             "$page_height" "$page_width" 0 0 "$NLIST_TEXT_OFFSET" inner \
             "$disp_list[@]"
     else
         # There is no search, but there was in previous loop
         # OR
         # Uniq mode was entered or left out
-        # -> compute new list (maybe also col_list)
+        # -> compute new list
         if [[ -n "$prev_search_buffer" || "$NLIST_IS_UNIQ_MODE" -ne "$prev_uniq_mode" ]]; then
             prev_search_buffer=""
             prev_uniq_mode="$NLIST_IS_UNIQ_MODE"
             # regenerating list -> regenerating disp_list
             prev_start_idx=-1
             # Take all elements, including duplicates and non-selectables
             typeset +U list
-            list=( "$@" )
+            repeat 1; do
+                list=( "$@" )
+            done
             # Remove non-selectable elements only when in uniq mode
             [ "$NLIST_IS_UNIQ_MODE" -eq 1 ] && [ "$#NLIST_NONSELECTABLE_ELEMENTS" -gt 0 ] &&
             for i in "${(nO)NLIST_NONSELECTABLE_ELEMENTS[@]}"; do
                 list[$i]=()
             done
             # Remove duplicates when in uniq mode
             [ "$NLIST_IS_UNIQ_MODE" -eq 1 ] && typeset -U list
-            # Apply coloring pattern (when not with search query)
-            is_colored=0
-            if [ -n "$NLIST_COLORING_PATTERN" ]; then
-                is_colored=1
-                _nlist_coloring_list_into_col_list
-            fi
             last_element="$#list"
             # Called after processing list
             _nlist_verify_vars
         fi
         # "1" - shouldn't bother with non-selectables
         _nlist_setup_user_vars "$NLIST_IS_UNIQ_MODE"
         integer end_idx=$(( NLIST_FROM_WHAT_IDX_LIST_IS_SHOWN + page_height - 1 ))
         [ "$end_idx" -gt "$last_element" ] && end_idx=last_element
-        if [ "$is_colored" -eq 0 ]; then
+        if [ "$prev_start_idx" -ne "$NLIST_FROM_WHAT_IDX_LIST_IS_SHOWN" ]; then
-            if [ "$prev_start_idx" -ne "$NLIST_FROM_WHAT_IDX_LIST_IS_SHOWN" ]; then
+            prev_start_idx="$NLIST_FROM_WHAT_IDX_LIST_IS_SHOWN"
-                prev_start_idx="$NLIST_FROM_WHAT_IDX_LIST_IS_SHOWN"
+            disp_list=( "${(@)list[NLIST_FROM_WHAT_IDX_LIST_IS_SHOWN, end_idx]}" )
-                disp_list=( "${(@)list[NLIST_FROM_WHAT_IDX_LIST_IS_SHOWN, end_idx]}" )
-                # We have display list, lets replace newlines with "\n" when needed (2/3)
+            [ -n "$NLIST_COLORING_PATTERN" ] && _nlist_colorify_disp_list
-                [ "$NLIST_REPLACE_NEWLINES" -eq 1 ] && disp_list=( "${(@)disp_list//$'\n'/\\n}" )
-            fi
-        else
-            if [ "$prev_start_idx" -ne "$NLIST_FROM_WHAT_IDX_LIST_IS_SHOWN" ]; then
-                prev_start_idx="$NLIST_FROM_WHAT_IDX_LIST_IS_SHOWN"
-                disp_list=( "${(@)col_list[NLIST_FROM_WHAT_IDX_LIST_IS_SHOWN, end_idx]}" )
-                # We have display list, lets replace newlines with "\n" when needed (3/3)
+            # We have display list, lets replace newlines with "\n" when needed (2/2)
-                [ "$NLIST_REPLACE_NEWLINES" -eq 1 ] && disp_list=( "${(@)disp_list//$'\n'/\\n}" )
+            [ "$NLIST_REPLACE_NEWLINES" -eq 1 ] && disp_list=( "${(@)disp_list//$'\n'/\\n}" )
-            fi
         fi
         # Output the list
         n-list-draw "$(( (NLIST_CURRENT_IDX-1) % page_height + 1 ))" \
             "$page_height" "$page_width" 0 0 "$NLIST_TEXT_OFFSET" inner \
             "$disp_list[@]"
     fi
     local status_msg_strlen
     if [ "$NLIST_IS_SEARCH_MODE" = "1" ]; then
         local _txt2=""
         [ "$NLIST_IS_UNIQ_MODE" -eq 1 ] && _txt2="[-UNIQ-] "
         _nlist_status_msg "${_txt2}Filtering with: ${NLIST_SEARCH_BUFFER// /+}"
     elif [[ ${NLIST_NONSELECTABLE_ELEMENTS[(r)$NLIST_CURRENT_IDX]} != $NLIST_CURRENT_IDX ||
             -n "$NLIST_SEARCH_BUFFER" || "$NLIST_IS_UNIQ_MODE" -eq 1 ]]; then
         local _txt="" _txt2=""
         [ -n "$NLIST_GREP_STRING" ] && _txt=" [$NLIST_GREP_STRING]"
         [ "$NLIST_IS_UNIQ_MODE" -eq 1 ] && _txt2="[-UNIQ-] "
         _nlist_status_msg "${_txt2}Current #$NLIST_USER_CURRENT_IDX (of #$NLIST_USER_LAST_ELEMENT entries)$_txt"
     else
         _nlist_status_msg ""
     fi
     zcurses border main
+    local top_msg="${(C)ZSH_NAME} $ZSH_VERSION, shell level $SHLVL, $USER"
+    zcurses move main 0 $(( term_width / 2 - $#top_msg / 2 ))
+    zcurses string main $top_msg
     zcurses refresh main inner
     zcurses move main $(( term_height - 1 - 1 )) $(( status_msg_strlen + 2 ))
     # Wait for input
     zcurses input main key keypad
     # Get the special (i.e. "keypad") key or regular key
     if [ -n "$key" ]; then
         final_key="$key"
     elif [ -n "$keypad" ]; then
         final_key="$keypad"
     else
         _nlist_status_msg "Inproper input detected"
         zcurses refresh main inner
     fi
     n-list-input "$NLIST_CURRENT_IDX" "$NLIST_FROM_WHAT_IDX_LIST_IS_SHOWN" \
                     "$page_height" "$page_width" "$last_element" "$NLIST_TEXT_OFFSET" \
                     "$final_key" "$NLIST_IS_SEARCH_MODE" "$NLIST_SEARCH_BUFFER" \
                     "$NLIST_IS_UNIQ_MODE"
     selection="$reply[1]"
     action="$reply[2]"
     NLIST_CURRENT_IDX="$reply[3]"
     NLIST_FROM_WHAT_IDX_LIST_IS_SHOWN="$reply[4]"
     NLIST_TEXT_OFFSET="$reply[5]"
     NLIST_IS_SEARCH_MODE="$reply[6]"
     NLIST_SEARCH_BUFFER="$reply[7]"
     NLIST_IS_UNIQ_MODE="$reply[8]"
     if [ "$action" = "SELECT" ]; then
         REPLY="$selection"
         reply=( "$list[@]" )
         break
     elif [ "$action" = "QUIT" ]; then

plugins/zsh-navigation-tools/n-panelize

Diff comments View file @ 61aaa7b

 # Copy this file into /usr/share/zsh/site-functions/
 # and add 'autoload n-panelize` to .zshrc
 #
 # This function somewhat reminds the panelize feature from Midnight Commander
 # It allows browsing output of arbitrary command. Example usage:
 # v-panelize ls /usr/local/bin
 #
 # Uses n-list
 emulate -L zsh
 setopt extendedglob
 zmodload zsh/curses
 local IFS="
 "
 unset NLIST_COLORING_PATTERN
 [ -f ~/.config/znt/n-list.conf ] && . ~/.config/znt/n-list.conf
 [ -f ~/.config/znt/n-panelize.conf ] && . ~/.config/znt/n-panelize.conf
 local list
 local selected
 NLIST_REMEMBER_STATE=0
 if [ -t 0 ]; then
     # Check if there is proper input
     if [ "$#" -lt 1 ]; then
         echo "Usage: n-panelize {command} [option|argument] ... or command | n-panelize"
         return 1
     fi
-    list=( `"$@"` )
+    # This loop makes script faster on some Zsh's (e.g. 5.0.8)
+    repeat 1; do
+        list=( `"$@"` )
+    done
     # TODO: $? doesn't reach user
     [ "$?" -eq 127 ] && return $?
 else
     # Check if can reattach to terminal
     if [[ ! -c /dev/tty && ! -t 2 ]]; then
         echo "No terminal available (no /dev/tty)"
         return 1
     fi
-    list=( "${(@f)"$(<&0)"}" )
+    # This loop makes script faster on some Zsh's (e.g. 5.0.8)
+    repeat 1; do
+        list=( "${(@f)"$(<&0)"}" )
+    done
     if [[ ! -c /dev/tty ]]; then
         exec <&2
     else
         exec </dev/tty
     fi
 fi
 n-list "${list[@]}"
 if [ "$REPLY" -gt 0 ]; then
     selected="$reply[REPLY]"
     print -zr "# $selected"
 fi
 # vim: set filetype=zsh:

themes/agnoster.zsh-theme

Diff comments View file @ 61aaa7b

 # vim:ft=zsh ts=2 sw=2 sts=2
 #
 # agnoster's Theme - https://gist.github.com/3712874
 # A Powerline-inspired theme for ZSH
 #
 # # README
 #
 # In order for this theme to render correctly, you will need a
 # [Powerline-patched font](https://github.com/Lokaltog/powerline-fonts).
 # Make sure you have a recent version: the code points that Powerline
 # uses changed in 2012, and older versions will display incorrectly,
 # in confusing ways.
 #
 # In addition, I recommend the
 # [Solarized theme](https://github.com/altercation/solarized/) and, if you're
 # using it on Mac OS X, [iTerm 2](http://www.iterm2.com/) over Terminal.app -
 # it has significantly better color fidelity.
 #
 # # Goals
 #
 # The aim of this theme is to only show you *relevant* information. Like most
 # prompts, it will only show git information when in a git working directory.
 # However, it goes a step further: everything from the current user and
 # hostname to whether the last call exited with an error to whether background
 # jobs are running in this shell will all be displayed automatically when
 # appropriate.
 ### Segment drawing
 # A few utility functions to make it easy and re-usable to draw segmented prompts
 CURRENT_BG='NONE'
 # Special Powerline characters
 () {
   local LC_ALL="" LC_CTYPE="en_US.UTF-8"
   # NOTE: This segment separator character is correct.  In 2012, Powerline changed
   # the code points they use for their special characters. This is the new code point.
   # If this is not working for you, you probably have an old version of the
   # Powerline-patched fonts installed. Download and install the new version.
   # Do not submit PRs to change this unless you have reviewed the Powerline code point
   # history and have new information.
   # This is defined using a Unicode escape sequence so it is unambiguously readable, regardless of
   # what font the user is viewing this source code in. Do not replace the
   # escape sequence with a single literal character.
-  SEGMENT_SEPARATOR=$'\ue0b0' # 
+  # Do not change this! Do not make it '\u2b80'; that is the old, wrong code point.
+  SEGMENT_SEPARATOR=$'\ue0b0'
 }
 # Begin a segment
 # Takes two arguments, background and foreground. Both can be omitted,
 # rendering default background/foreground.
 prompt_segment() {
   local bg fg
   [[ -n $1 ]] && bg="%K{$1}" || bg="%k"
   [[ -n $2 ]] && fg="%F{$2}" || fg="%f"
   if [[ $CURRENT_BG != 'NONE' && $1 != $CURRENT_BG ]]; then
     echo -n " %{$bg%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR%{$fg%} "
   else
     echo -n "%{$bg%}%{$fg%} "
   fi
   CURRENT_BG=$1
   [[ -n $3 ]] && echo -n $3
 }
 # End the prompt, closing any open segments
 prompt_end() {
   if [[ -n $CURRENT_BG ]]; then
     echo -n " %{%k%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR"
   else
     echo -n "%{%k%}"
   fi
   echo -n "%{%f%}"
   CURRENT_BG=''
 }
 ### Prompt components
 # Each component will draw itself, and hide itself if no information needs to be shown
 # Context: user@hostname (who am I and where am I)
 prompt_context() {
   if [[ "$USER" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
     prompt_segment black default "%(!.%{%F{yellow}%}.)$USER@%m"
   fi
 }
 # Git: branch/detached head, dirty status
 prompt_git() {
   local PL_BRANCH_CHAR
   () {
     local LC_ALL="" LC_CTYPE="en_US.UTF-8"
     PL_BRANCH_CHAR=$'\ue0a0'         # 
   }
   local ref dirty mode repo_path
   repo_path=$(git rev-parse --git-dir 2>/dev/null)
   if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
     dirty=$(parse_git_dirty)
     ref=$(git symbolic-ref HEAD 2> /dev/null) || ref="➦ $(git rev-parse --short HEAD 2> /dev/null)"
     if [[ -n $dirty ]]; then
       prompt_segment yellow black
     else
       prompt_segment green black
     fi
     if [[ -e "${repo_path}/BISECT_LOG" ]]; then
       mode=" <B>"
     elif [[ -e "${repo_path}/MERGE_HEAD" ]]; then
       mode=" >M<"
     elif [[ -e "${repo_path}/rebase" || -e "${repo_path}/rebase-apply" || -e "${repo_path}/rebase-merge" || -e "${repo_path}/../.dotest" ]]; then
       mode=" >R>"
     fi
     setopt promptsubst
     autoload -Uz vcs_info
     zstyle ':vcs_info:*' enable git
     zstyle ':vcs_info:*' get-revision true
     zstyle ':vcs_info:*' check-for-changes true
     zstyle ':vcs_info:*' stagedstr '✚'
     zstyle ':vcs_info:*' unstagedstr '●'
     zstyle ':vcs_info:*' formats ' %u%c'
     zstyle ':vcs_info:*' actionformats ' %u%c'
     vcs_info
     echo -n "${ref/refs\/heads\//$PL_BRANCH_CHAR }${vcs_info_msg_0_%% }${mode}"
   fi
 }
 prompt_hg() {
   local rev status
   if $(hg id >/dev/null 2>&1); then
     if $(hg prompt >/dev/null 2>&1); then
       if [[ $(hg prompt "{status|unknown}") = "?" ]]; then
         # if files are not added
         prompt_segment red white
         st='±'
       elif [[ -n $(hg prompt "{status|modified}") ]]; then
         # if any modification
         prompt_segment yellow black
         st='±'
       else
         # if working copy is clean
         prompt_segment green black
       fi
       echo -n $(hg prompt "☿ {rev}@{branch}") $st
     else
       st=""
       rev=$(hg id -n 2>/dev/null | sed 's/[^-0-9]//g')
       branch=$(hg id -b 2>/dev/null)
       if `hg st | grep -q "^\?"`; then
         prompt_segment red black
         st='±'
       elif `hg st | grep -q "^[MA]"`; then
         prompt_segment yellow black
         st='±'
       else
         prompt_segment green black
       fi
       echo -n "☿ $rev@$branch" $st
     fi
   fi
 }
 # Dir: current working directory
 prompt_dir() {
   prompt_segment blue black '%~'
 }
 # Virtualenv: current working virtualenv
 prompt_virtualenv() {
   local virtualenv_path="$VIRTUAL_ENV"
   if [[ -n $virtualenv_path && -n $VIRTUAL_ENV_DISABLE_PROMPT ]]; then
     prompt_segment blue black "(`basename $virtualenv_path`)"
   fi
 }
 # Status:
 # - was there an error
 # - am I root
 # - are there background jobs?
 prompt_status() {
   local symbols
   symbols=()
   [[ $RETVAL -ne 0 ]] && symbols+="%{%F{red}%}✘"
   [[ $UID -eq 0 ]] && symbols+="%{%F{yellow}%}⚡"
   [[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{cyan}%}⚙"
   [[ -n "$symbols" ]] && prompt_segment black default "$symbols"
 }
 ## Main prompt
 build_prompt() {
   RETVAL=$?
   prompt_status
   prompt_virtualenv
   prompt_context
   prompt_dir
   prompt_git
   prompt_hg
   prompt_end
 }
 PROMPT='%{%f%b%k%}$(build_prompt) '

themes/eastwood.zsh-theme

Diff comments View file @ 61aaa7b

themes/fishy.zsh-theme

Diff comments View file @ 61aaa7b

themes/frontcube.zsh-theme

Diff comments View file @ 61aaa7b

1	local rvm="%{$fg[green]%}[$(rvm-prompt i v g)]%{$reset_color%}"	1	local rvm="%{$fg[green]%}[$(rvm-prompt i v g)]%{$reset_color%}"
2		2
3	PROMPT='	3	PROMPT='
4	%{$fg_bold[gray]%}%~%{$fg_bold[blue]%}%{$fg_bold[blue]%} % %{$reset_color%}	4	%{$fg_bold[gray]%}%~%{$fg_bold[blue]%}%{$fg_bold[blue]%} % %{$reset_color%}
5	%{$fg[green]%}➞ %{$reset_color%'	5	%{$fg[green]%}➞ %{$reset_color%'
6		6
7	RPROMPT='$(git_prompt_info) $(rvm)'	7	RPROMPT='$(git_prompt_info) ${rvm}'
8		8
9	ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}[git:"	9	ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}[git:"
10	ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"	10	ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
11	ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}] %{$fg[red]%}✖ %{$reset_color%}"	11	ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}] %{$fg[red]%}✖ %{$reset_color%}"
12	ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%}] %{$fg[green]%}✔%{$reset_color%}"	12	ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%}] %{$fg[green]%}✔%{$reset_color%}"
13		13

themes/gallois.zsh-theme

Diff comments View file @ 61aaa7b

+# Depends on the git plugin for work_in_progress()
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}["
 ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}"
 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)
+  local cb=$(git_current_branch)
   if [ -n "$cb" ]; then
-    echo "$(parse_git_dirty)%{$fg_bold[yellow]%}$(work_in_progress)%{$reset_color%}$ZSH_THEME_GIT_PROMPT_PREFIX$(current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX"
+    echo "$(parse_git_dirty)%{$fg_bold[yellow]%}$(work_in_progress)%{$reset_color%}$ZSH_THEME_GIT_PROMPT_PREFIX$(git_current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX"
   fi
 }
 # RVM component of prompt
 ZSH_THEME_RVM_PROMPT_PREFIX="%{$fg[red]%}["
 ZSH_THEME_RVM_PROMPT_SUFFIX="]%{$reset_color%}"
 # Combine it all into a final right-side prompt
 RPS1='$(git_custom_status)$(ruby_prompt_info) $EPS1'
 PROMPT='%{$fg[cyan]%}[%~% ]%(?.%{$fg[green]%}.%{$fg[red]%})%B$%b '

themes/josh.zsh-theme

Diff comments View file @ 61aaa7b

1	grey='\e[0;90m'	1	grey='\e[0;90m'
2		2
3	ZSH_THEME_GIT_PROMPT_PREFIX="%{$grey%}("	3	ZSH_THEME_GIT_PROMPT_PREFIX="%{$grey%}("
4	ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"	4	ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
5	ZSH_THEME_GIT_PROMPT_DIRTY="%{$grey%}) %{$fg[yellow]%}✗%{$reset_color%}"	5	ZSH_THEME_GIT_PROMPT_DIRTY="%{$grey%}) %{$fg[yellow]%}✗%{$reset_color%}"
6	ZSH_THEME_GIT_PROMPT_CLEAN="%{$grey%})"	6	ZSH_THEME_GIT_PROMPT_CLEAN="%{$grey%})"
7		7
8	function josh_prompt {	8	function josh_prompt {
9	(( spare_width = ${COLUMNS} ))	9	(( spare_width = ${COLUMNS} ))
10	prompt=" "	10	prompt=" "
11		11
12	branch=$(current_branch)	12	branch=$(git_current_branch)
13	ruby_version=$(rvm_prompt_info \|\| rbenv_prompt_info)	13	ruby_version=$(rvm_prompt_info \|\| rbenv_prompt_info)
14	path_size=${#PWD}	14	path_size=${#PWD}
15	branch_size=${#branch}	15	branch_size=${#branch}
16	ruby_size=${#ruby_version}	16	ruby_size=${#ruby_version}
17	user_machine_size=${#${(%):-%n@%m-}}	17	user_machine_size=${#${(%):-%n@%m-}}
18		18
19	if [[ ${#branch} -eq 0 ]]	19	if [[ ${#branch} -eq 0 ]]
20	then (( ruby_size = ruby_size + 1 ))	20	then (( ruby_size = ruby_size + 1 ))
21	else	21	else
22	(( branch_size = branch_size + 4 ))	22	(( branch_size = branch_size + 4 ))
23	if [[ -n $(git status -s 2> /dev/null) ]]; then	23	if [[ -n $(git status -s 2> /dev/null) ]]; then
24	(( branch_size = branch_size + 2 ))	24	(( branch_size = branch_size + 2 ))
25	fi	25	fi
26	fi	26	fi
27		27
28	(( spare_width = ${spare_width} - (${user_machine_size} + ${path_size} + ${branch_size} + ${ruby_size}) ))	28	(( spare_width = ${spare_width} - (${user_machine_size} + ${path_size} + ${branch_size} + ${ruby_size}) ))
29		29
30	while [ ${#prompt} -lt $spare_width ]; do	30	while [ ${#prompt} -lt $spare_width ]; do
31	prompt=" $prompt"	31	prompt=" $prompt"
32	done	32	done
33		33
34	prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(rvm_prompt_info \|\| rbenv_prompt_info)%{$reset_color%} $(current_branch)"	34	prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(rvm_prompt_info \|\| rbenv_prompt_info)%{$reset_color%} $(git_current_branch)"
35		35
36	echo $prompt	36	echo $prompt
37	}	37	}
38		38
39	setopt prompt_subst	39	setopt prompt_subst
40		40
41	PROMPT='	41	PROMPT='
42	%n@%m $(josh_prompt)	42	%n@%m $(josh_prompt)
43	%(?,%{%F{green}%},%{%F{red}%})⚡%{$reset_color%} '	43	%(?,%{%F{green}%},%{%F{red}%})⚡%{$reset_color%} '
44		44

themes/juanghurtado.zsh-theme

Diff comments View file @ 61aaa7b

-# Needs Git plugin for current_branch method
 # Color shortcuts
 RED=$fg[red]
 YELLOW=$fg[yellow]
 GREEN=$fg[green]
 WHITE=$fg[white]
 BLUE=$fg[blue]
 RED_BOLD=$fg_bold[red]
 YELLOW_BOLD=$fg_bold[yellow]
 GREEN_BOLD=$fg_bold[green]
 WHITE_BOLD=$fg_bold[white]
 BLUE_BOLD=$fg_bold[blue]
 RESET_COLOR=$reset_color
 # Format for git_prompt_info()
 ZSH_THEME_GIT_PROMPT_PREFIX=""
 ZSH_THEME_GIT_PROMPT_SUFFIX=""
 # Format for parse_git_dirty()
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$RED%}(*)"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 # Format for git_prompt_status()
 ZSH_THEME_GIT_PROMPT_UNMERGED=" %{$RED%}unmerged"
 ZSH_THEME_GIT_PROMPT_DELETED=" %{$RED%}deleted"
 ZSH_THEME_GIT_PROMPT_RENAMED=" %{$YELLOW%}renamed"
 ZSH_THEME_GIT_PROMPT_MODIFIED=" %{$YELLOW%}modified"
 ZSH_THEME_GIT_PROMPT_ADDED=" %{$GREEN%}added"
 ZSH_THEME_GIT_PROMPT_UNTRACKED=" %{$WHITE%}untracked"
 # Format for git_prompt_ahead()
 ZSH_THEME_GIT_PROMPT_AHEAD=" %{$RED%}(!)"
 # Format for git_prompt_long_sha() and git_prompt_short_sha()
 ZSH_THEME_GIT_PROMPT_SHA_BEFORE=" %{$WHITE%}[%{$YELLOW%}"
 ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$WHITE%}]"
 # Prompt format
 PROMPT='
 %{$GREEN_BOLD%}%n@%m%{$WHITE%}:%{$YELLOW%}%~%u$(parse_git_dirty)$(git_prompt_ahead)%{$RESET_COLOR%}
 %{$BLUE%}>%{$RESET_COLOR%} '
-RPROMPT='%{$GREEN_BOLD%}$(current_branch)$(git_prompt_short_sha)$(git_prompt_status)%{$RESET_COLOR%}'
+RPROMPT='%{$GREEN_BOLD%}$(git_current_branch)$(git_prompt_short_sha)$(git_prompt_status)%{$RESET_COLOR%}'

themes/mortalscumbag.zsh-theme

Diff comments View file @ 61aaa7b

themes/peepcode.zsh-theme

Diff comments View file @ 61aaa7b

1	#	1	#
2	# Based on Geoffrey Grosenbach's peepcode zsh theme from	2	# Based on Geoffrey Grosenbach's peepcode zsh theme from
3	# https://github.com/topfunky/zsh-simple	3	# https://github.com/topfunky/zsh-simple
4	#	4	#
5		5
6	git_repo_path() {	6	git_repo_path() {
7	git rev-parse --git-dir 2>/dev/null	7	git rev-parse --git-dir 2>/dev/null
8	}	8	}
9		9
10	git_commit_id() {	10	git_commit_id() {
11	git rev-parse --short HEAD 2>/dev/null	11	git rev-parse --short HEAD 2>/dev/null
12	}	12	}
13		13
14	git_mode() {	14	git_mode() {
15	if [[ -e "$repo_path/BISECT_LOG" ]]; then	15	if [[ -e "$repo_path/BISECT_LOG" ]]; then
16	echo "+bisect"	16	echo "+bisect"
17	elif [[ -e "$repo_path/MERGE_HEAD" ]]; then	17	elif [[ -e "$repo_path/MERGE_HEAD" ]]; then
18	echo "+merge"	18	echo "+merge"
19	elif [[ -e "$repo_path/rebase" \|\| -e "$repo_path/rebase-apply" \|\| -e "$repo_path/rebase-merge" \|\| -e "$repo_path/../.dotest" ]]; then	19	elif [[ -e "$repo_path/rebase" \|\| -e "$repo_path/rebase-apply" \|\| -e "$repo_path/rebase-merge" \|\| -e "$repo_path/../.dotest" ]]; then
20	echo "+rebase"	20	echo "+rebase"
21	fi	21	fi
22	}	22	}
23		23
24	git_dirty() {	24	git_dirty() {
25	if [[ "$repo_path" != '.' && `git ls-files -m` != "" ]]; then	25	if [[ "$repo_path" != '.' && `git ls-files -m` != "" ]]; then
26	echo " %{$fg_bold[grey]%}✗%{$reset_color%}"	26	echo " %{$fg_bold[grey]%}✗%{$reset_color%}"
27	fi	27	fi
28	}	28	}
29		29
30	git_prompt() {	30	git_prompt() {
31	local cb=$(current_branch)	31	local cb=$(git_current_branch)
32	if [ -n "$cb" ]; then	32	if [ -n "$cb" ]; then
33	local repo_path=$(git_repo_path)	33	local repo_path=$(git_repo_path)
34	echo " %{$fg_bold[grey]%}$cb %{$fg[white]%}$(git_commit_id)%{$reset_color%}$(git_mode)$(git_dirty)"	34	echo " %{$fg_bold[grey]%}$cb %{$fg[white]%}$(git_commit_id)%{$reset_color%}$(git_mode)$(git_dirty)"
35	fi	35	fi
36	}	36	}
37		37
38	local smiley="%(?,%{$fg[green]%}☺%{$reset_color%},%{$fg[red]%}☹%{$reset_color%})"	38	local smiley="%(?,%{$fg[green]%}☺%{$reset_color%},%{$fg[red]%}☹%{$reset_color%})"
39		39
40	PROMPT='	40	PROMPT='
41	%~	41	%~
42	${smiley} %{$reset_color%}'	42	${smiley} %{$reset_color%}'
43		43
44	RPROMPT='%{$fg[white]%} $(~/.rvm/bin/rvm-prompt)$(git_prompt)%{$reset_color%}'	44	RPROMPT='%{$fg[white]%} $(~/.rvm/bin/rvm-prompt)$(git_prompt)%{$reset_color%}'
45		45

themes/sunrise.zsh-theme

Diff comments View file @ 61aaa7b

 # Sunrise theme for oh-my-zsh
 # Intended to be used with Solarized: http://ethanschoonover.com/solarized
-# (Needs Git plugin for current_branch method)
 # Color shortcuts
 R=$fg_no_bold[red]
 G=$fg_no_bold[green]
 M=$fg_no_bold[magenta]
 Y=$fg_no_bold[yellow]
 B=$fg_no_bold[blue]
 RESET=$reset_color
 if [ "$USER" = "root" ]; then
     PROMPTCOLOR="%{$R%}" PREFIX="-!-";
 else
     PROMPTCOLOR="" PREFIX="---";
 fi
 local return_code="%(?..%{$R%}%? ↵%{$RESET%})"
 # Get the status of the working tree (copied and modified from git.zsh)
 custom_git_prompt_status() {
   INDEX=$(git status --porcelain 2> /dev/null)
   STATUS=""
   # Non-staged
   if $(echo "$INDEX" | grep '^?? ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
   fi
   if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
   fi
   if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
   fi
   if $(echo "$INDEX" | grep '^.M ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
   elif $(echo "$INDEX" | grep '^AM ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
   elif $(echo "$INDEX" | grep '^ T ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
   fi
   # Staged
   if $(echo "$INDEX" | grep '^D  ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_STAGED_DELETED$STATUS"
   fi
   if $(echo "$INDEX" | grep '^R' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_STAGED_RENAMED$STATUS"
   fi
   if $(echo "$INDEX" | grep '^M' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_STAGED_MODIFIED$STATUS"
   fi
   if $(echo "$INDEX" | grep '^A' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_STAGED_ADDED$STATUS"
   fi
   if $(echo -n "$STATUS" | grep '.*' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_STATUS_PREFIX$STATUS"
   fi
   echo $STATUS
 }
 # get the name of the branch we are on (copied and modified from git.zsh)
 function custom_git_prompt() {
   ref=$(git symbolic-ref HEAD 2> /dev/null) || return
   echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$(git_prompt_ahead)$(custom_git_prompt_status)$ZSH_THEME_GIT_PROMPT_SUFFIX"
 }
 # %B sets bold text
 PROMPT='%B$PREFIX %2~ $(custom_git_prompt)%{$M%}%B»%b%{$RESET%} '
 RPS1="${return_code}"
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$Y%}‹"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$Y%}›%{$RESET%} "
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$R%}*"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 ZSH_THEME_GIT_PROMPT_AHEAD="%{$B%}➔"
 ZSH_THEME_GIT_STATUS_PREFIX=" "
 # Staged
 ZSH_THEME_GIT_PROMPT_STAGED_ADDED="%{$G%}A"
 ZSH_THEME_GIT_PROMPT_STAGED_MODIFIED="%{$G%}M"
 ZSH_THEME_GIT_PROMPT_STAGED_RENAMED="%{$G%}R"
 ZSH_THEME_GIT_PROMPT_STAGED_DELETED="%{$G%}D"
 # Not-staged
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$R%}?"
 ZSH_THEME_GIT_PROMPT_MODIFIED="%{$R%}M"
 ZSH_THEME_GIT_PROMPT_DELETED="%{$R%}D"
 ZSH_THEME_GIT_PROMPT_UNMERGED="%{$R%}UU"

tools/upgrade.sh

Diff comments View file @ 61aaa7b

1		1
2	# Use colors, but only if connected to a terminal, and that terminal	2	# Use colors, but only if connected to a terminal, and that terminal
3	# supports them.	3	# supports them.
4	if which tput >/dev/null 2>&1; then	4	if which tput >/dev/null 2>&1; then
5	ncolors=$(tput colors)	5	ncolors=$(tput colors)
6	fi	6	fi
7	if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then	7	if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
8	RED="$(tput setaf 1)"	8	RED="$(tput setaf 1)"
9	GREEN="$(tput setaf 2)"	9	GREEN="$(tput setaf 2)"
10	YELLOW="$(tput setaf 3)"	10	YELLOW="$(tput setaf 3)"
11	BLUE="$(tput setaf 4)"	11	BLUE="$(tput setaf 4)"
12	BOLD="$(tput bold)"	12	BOLD="$(tput bold)"
13	NORMAL="$(tput sgr0)"	13	NORMAL="$(tput sgr0)"
14	else	14	else
15	RED=""	15	RED=""
16	GREEN=""	16	GREEN=""
17	YELLOW=""	17	YELLOW=""
18	BLUE=""	18	BLUE=""
19	BOLD=""	19	BOLD=""
20	NORMAL=""	20	NORMAL=""
21	fi	21	fi
22		22
23	printf "${BLUE}%s${NORMAL}\n" "Upgrading Oh My Zsh"	23	printf "${BLUE}%s${NORMAL}\n" "Updating Oh My Zsh"
24	cd "$ZSH"	24	cd "$ZSH"
25	if git pull --rebase --stat origin master	25	if git pull --rebase --stat origin master
26	then	26	then
27	printf '%s' "$GREEN"	27	printf '%s' "$GREEN"
28	printf '%s\n' ' __ __ '	28	printf '%s\n' ' __ __ '
29	printf '%s\n' ' ____ / /_ ____ ___ __ __ ____ _____/ /_ '	29	printf '%s\n' ' ____ / /_ ____ ___ __ __ ____ _____/ /_ '
30	printf '%s\n' ' / __ \/ __ \ / __ `__ \/ / / / /_ / / ___/ __ \ '	30	printf '%s\n' ' / __ \/ __ \ / __ `__ \/ / / / /_ / / ___/ __ \ '
31	printf '%s\n' '/ /_/ / / / / / / / / / / /_/ / / /_(__ ) / / / '	31	printf '%s\n' '/ /_/ / / / / / / / / / / /_/ / / /_(__ ) / / / '
32	printf '%s\n' '\____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ '	32	printf '%s\n' '\____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ '
33	printf '%s\n' ' /____/ '	33	printf '%s\n' ' /____/ '
34	printf "${BLUE}%s\n" "Hooray! Oh My Zsh has been updated and/or is at the current version."	34	printf "${BLUE}%s\n" "Hooray! Oh My Zsh has been updated and/or is at the current version."
35	printf "${BLUE}${BOLD}%s${NORMAL}\n" "To keep up on the latest news and updates, follow us on twitter: https://twitter.com/ohmyzsh"	35	printf "${BLUE}${BOLD}%s${NORMAL}\n" "To keep up on the latest news and updates, follow us on twitter: https://twitter.com/ohmyzsh"
36	printf "${BLUE}${BOLD}%s${NORMAL}\n" "Get your Oh My Zsh swag at: http://shop.planetargon.com/"	36	printf "${BLUE}${BOLD}%s${NORMAL}\n" "Get your Oh My Zsh swag at: http://shop.planetargon.com/"
37	else	37	else
38	printf "${RED}%s${NORMAL}\n" 'There was an error updating. Try again later?'	38	printf "${RED}%s${NORMAL}\n" 'There was an error updating. Try again later?'
39	fi	39	fi
40		40

Link here
mj 2016-01-13 02:01:19 UTC

mentioned in commit 172a72

_mentioned in commit 172a72_

Choose File ... File name...
Cancel

1	The MIT License	1	The MIT License (MIT)
2		2
3	Copyright (c) 2009-2015 Robby Russell and contributors (see https://github.com/robbyrussell/oh-my-zsh/contributors)	3	Copyright (c) 2009-2016 Robby Russell and contributors
		4	See the full list at https://github.com/robbyrussell/oh-my-zsh/contributors
4		5
5	Permission is hereby granted, free of charge, to any person obtaining a copy	6	Permission is hereby granted, free of charge, to any person obtaining a copy
6	of this software and associated documentation files (the "Software"), to deal	7	of this software and associated documentation files (the "Software"), to deal
7	in the Software without restriction, including without limitation the rights	8	in the Software without restriction, including without limitation the rights
8	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell	9	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9	copies of the Software, and to permit persons to whom the Software is	10	copies of the Software, and to permit persons to whom the Software is
10	furnished to do so, subject to the following conditions:	11	furnished to do so, subject to the following conditions:
11		12
12	The above copyright notice and this permission notice shall be included in	13	The above copyright notice and this permission notice shall be included in all
13	all copies or substantial portions of the Software.	14	copies or substantial portions of the Software.
14		15
15	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR	16	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,	17	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE	18	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER	19	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,	20	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN	21	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21	THE SOFTWARE.	22	SOFTWARE.
22		23

1	# Archlinux zsh aliases and functions	1	# Archlinux zsh aliases and functions
2	# Usage is also described at https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins	2	# Usage is also described at https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins
3		3
4	# Look for yaourt, and add some useful functions if we have it.	4	# Look for yaourt, and add some useful functions if we have it.
5	if [[ -x `command -v yaourt` ]]; then	5	if (( $+commands[yaourt] )); then
6	upgrade () {	6	upgrade () {
7	yaourt -Syu	7	yaourt -Syu
8	}	8	}
9	alias yaconf='yaourt -C' # Fix all configuration files with vimdiff	9	alias yaconf='yaourt -C' # Fix all configuration files with vimdiff
10	# Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips	10	# Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips
11	alias yaupg='yaourt -Syua' # Synchronize with repositories before upgrading packages (AUR packages too) that are out of date on the local system.	11	alias yaupg='yaourt -Syua' # Synchronize with repositories before upgrading packages (AUR packages too) that are out of date on the local system.
12	alias yasu='yaourt --sucre' # Same as yaupg, but without confirmation	12	alias yasu='yaourt --sucre' # Same as yaupg, but without confirmation
13	alias yain='yaourt -S' # Install specific package(s) from the repositories	13	alias yain='yaourt -S' # Install specific package(s) from the repositories
14	alias yains='yaourt -U' # Install specific package not from the repositories but from a file	14	alias yains='yaourt -U' # Install specific package not from the repositories but from a file
15	alias yare='yaourt -R' # Remove the specified package(s), retaining its configuration(s) and required dependencies	15	alias yare='yaourt -R' # Remove the specified package(s), retaining its configuration(s) and required dependencies
16	alias yarem='yaourt -Rns' # Remove the specified package(s), its configuration(s) and unneeded dependencies	16	alias yarem='yaourt -Rns' # Remove the specified package(s), its configuration(s) and unneeded dependencies
17	alias yarep='yaourt -Si' # Display information about a given package in the repositories	17	alias yarep='yaourt -Si' # Display information about a given package in the repositories
18	alias yareps='yaourt -Ss' # Search for package(s) in the repositories	18	alias yareps='yaourt -Ss' # Search for package(s) in the repositories
19	alias yaloc='yaourt -Qi' # Display information about a given package in the local database	19	alias yaloc='yaourt -Qi' # Display information about a given package in the local database
20	alias yalocs='yaourt -Qs' # Search for package(s) in the local database	20	alias yalocs='yaourt -Qs' # Search for package(s) in the local database
21	alias yalst='yaourt -Qe' # List installed packages, even those installed from AUR (they're tagged as "local")	21	alias yalst='yaourt -Qe' # List installed packages, even those installed from AUR (they're tagged as "local")
22	alias yaorph='yaourt -Qtd' # Remove orphans using yaourt	22	alias yaorph='yaourt -Qtd' # Remove orphans using yaourt
23	# Additional yaourt alias examples	23	# Additional yaourt alias examples
24	if [[ -x `command -v abs` && -x `command -v aur` ]]; then	24	if (( $+commands[abs] && $+commands[aur] )); then
25	alias yaupd='yaourt -Sy && sudo abs && sudo aur' # Update and refresh the local package, ABS and AUR databases against repositories	25	alias yaupd='yaourt -Sy && sudo abs && sudo aur' # Update and refresh the local package, ABS and AUR databases against repositories
26	elif [[ -x `command -v abs` ]]; then	26	elif (( $+commands[abs] )); then
27	alias yaupd='yaourt -Sy && sudo abs' # Update and refresh the local package and ABS databases against repositories	27	alias yaupd='yaourt -Sy && sudo abs' # Update and refresh the local package and ABS databases against repositories
28	elif [[ -x `command -v aur` ]]; then	28	elif (( $+commands[aur] )); then
29	alias yaupd='yaourt -Sy && sudo aur' # Update and refresh the local package and AUR databases against repositories	29	alias yaupd='yaourt -Sy && sudo aur' # Update and refresh the local package and AUR databases against repositories
30	else	30	else
31	alias yaupd='yaourt -Sy' # Update and refresh the local package database against repositories	31	alias yaupd='yaourt -Sy' # Update and refresh the local package database against repositories
32	fi	32	fi
33	alias yainsd='yaourt -S --asdeps' # Install given package(s) as dependencies of another package	33	alias yainsd='yaourt -S --asdeps' # Install given package(s) as dependencies of another package
34	alias yamir='yaourt -Syy' # Force refresh of all package lists after updating /etc/pacman.d/mirrorlist	34	alias yamir='yaourt -Syy' # Force refresh of all package lists after updating /etc/pacman.d/mirrorlist
35	else	35	else
36	upgrade() {	36	upgrade() {
37	sudo pacman -Syu	37	sudo pacman -Syu
38	}	38	}
39	fi	39	fi
40		40
41	# Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips	41	# Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips
42	alias pacupg='sudo pacman -Syu' # Synchronize with repositories before upgrading packages that are out of date on the local system.	42	alias pacupg='sudo pacman -Syu' # Synchronize with repositories before upgrading packages that are out of date on the local system.
43	alias pacin='sudo pacman -S' # Install specific package(s) from the repositories	43	alias pacin='sudo pacman -S' # Install specific package(s) from the repositories
44	alias pacins='sudo pacman -U' # Install specific package not from the repositories but from a file	44	alias pacins='sudo pacman -U' # Install specific package not from the repositories but from a file
45	alias pacre='sudo pacman -R' # Remove the specified package(s), retaining its configuration(s) and required dependencies	45	alias pacre='sudo pacman -R' # Remove the specified package(s), retaining its configuration(s) and required dependencies
46	alias pacrem='sudo pacman -Rns' # Remove the specified package(s), its configuration(s) and unneeded dependencies	46	alias pacrem='sudo pacman -Rns' # Remove the specified package(s), its configuration(s) and unneeded dependencies
47	alias pacrep='pacman -Si' # Display information about a given package in the repositories	47	alias pacrep='pacman -Si' # Display information about a given package in the repositories
48	alias pacreps='pacman -Ss' # Search for package(s) in the repositories	48	alias pacreps='pacman -Ss' # Search for package(s) in the repositories
49	alias pacloc='pacman -Qi' # Display information about a given package in the local database	49	alias pacloc='pacman -Qi' # Display information about a given package in the local database
50	alias paclocs='pacman -Qs' # Search for package(s) in the local database	50	alias paclocs='pacman -Qs' # Search for package(s) in the local database
51	# Additional pacman alias examples	51	# Additional pacman alias examples
52	if [[ -x `command -v abs` && -x `command -v aur` ]]; then	52	if (( $+commands[abs] && $+commands[aur] )); then
53	alias pacupd='sudo pacman -Sy && sudo abs && sudo aur' # Update and refresh the local package, ABS and AUR databases against repositories	53	alias pacupd='sudo pacman -Sy && sudo abs && sudo aur' # Update and refresh the local package, ABS and AUR databases against repositories
54	elif [[ -x `command -v abs` ]]; then	54	elif (( $+commands[abs] )); then
55	alias pacupd='sudo pacman -Sy && sudo abs' # Update and refresh the local package and ABS databases against repositories	55	alias pacupd='sudo pacman -Sy && sudo abs' # Update and refresh the local package and ABS databases against repositories
56	elif [[ -x `command -v aur` ]]; then	56	elif (( $+commands[aur] )); then
57	alias pacupd='sudo pacman -Sy && sudo aur' # Update and refresh the local package and AUR databases against repositories	57	alias pacupd='sudo pacman -Sy && sudo aur' # Update and refresh the local package and AUR databases against repositories
58	else	58	else
59	alias pacupd='sudo pacman -Sy' # Update and refresh the local package database against repositories	59	alias pacupd='sudo pacman -Sy' # Update and refresh the local package database against repositories
60	fi	60	fi
61	alias pacinsd='sudo pacman -S --asdeps' # Install given package(s) as dependencies of another package	61	alias pacinsd='sudo pacman -S --asdeps' # Install given package(s) as dependencies of another package
62	alias pacmir='sudo pacman -Syy' # Force refresh of all package lists after updating /etc/pacman.d/mirrorlist	62	alias pacmir='sudo pacman -Syy' # Force refresh of all package lists after updating /etc/pacman.d/mirrorlist
63		63
64	# https://bbs.archlinux.org/viewtopic.php?id=93683	64	# https://bbs.archlinux.org/viewtopic.php?id=93683
65	paclist() {	65	paclist() {
66	LC_ALL=C pacman -Qei $(pacman -Qu\|cut -d" " -f 1)\|awk ' BEGIN {FS=":"}/^Name/{printf("\033[1;36m%s\033[1;37m", $2)}/^Description/{print $2}'	66	LC_ALL=C pacman -Qei $(pacman -Qu\|cut -d" " -f 1)\|awk ' BEGIN {FS=":"}/^Name/{printf("\033[1;36m%s\033[1;37m", $2)}/^Description/{print $2}'
67	}	67	}
68		68
69	alias paclsorphans='sudo pacman -Qdt'	69	alias paclsorphans='sudo pacman -Qdt'
70	alias pacrmorphans='sudo pacman -Rs $(pacman -Qtdq)'	70	alias pacrmorphans='sudo pacman -Rs $(pacman -Qtdq)'
71		71
72	pacdisowned() {	72	pacdisowned() {
73	tmp=${TMPDIR-/tmp}/pacman-disowned-$UID-$$	73	tmp=${TMPDIR-/tmp}/pacman-disowned-$UID-$$
74	db=$tmp/db	74	db=$tmp/db
75	fs=$tmp/fs	75	fs=$tmp/fs
76		76
77	mkdir "$tmp"	77	mkdir "$tmp"
78	trap 'rm -rf "$tmp"' EXIT	78	trap 'rm -rf "$tmp"' EXIT
79		79
80	pacman -Qlq \| sort -u > "$db"	80	pacman -Qlq \| sort -u > "$db"
81		81
82	find /bin /etc /lib /sbin /usr \	82	find /bin /etc /lib /sbin /usr \
83	! -name lost+found \	83	! -name lost+found \
84	\( -type d -printf '%p/\n' -o -print \) \| sort > "$fs"	84	\( -type d -printf '%p/\n' -o -print \) \| sort > "$fs"
85		85
86	comm -23 "$fs" "$db"	86	comm -23 "$fs" "$db"
87	}	87	}
88		88
89	pacmanallkeys() {	89	pacmanallkeys() {
90	# Get all keys for developers and trusted users	90	# Get all keys for developers and trusted users
91	curl https://www.archlinux.org/{developers,trustedusers}/ \|	91	curl https://www.archlinux.org/{developers,trustedusers}/ \|
92	awk -F\" '(/pgp.mit.edu/) {sub(/.*search=0x/,"");print $1}' \|	92	awk -F\" '(/pgp.mit.edu/) {sub(/.*search=0x/,"");print $1}' \|
93	xargs sudo pacman-key --recv-keys	93	xargs sudo pacman-key --recv-keys
94	}	94	}
95		95
96	pacmansignkeys() {	96	pacmansignkeys() {
97	for key in $*; do	97	for key in $*; do
98	sudo pacman-key --recv-keys $key	98	sudo pacman-key --recv-keys $key
99	sudo pacman-key --lsign-key $key	99	sudo pacman-key --lsign-key $key
100	printf 'trust\n3\n' \| sudo gpg --homedir /etc/pacman.d/gnupg \	100	printf 'trust\n3\n' \| sudo gpg --homedir /etc/pacman.d/gnupg \
101	--no-permission-warning --command-fd 0 --edit-key $key	101	--no-permission-warning --command-fd 0 --edit-key $key
102	done	102	done
103	}	103	}
104		104

1	# This file integrates the zsh-history-substring-search script into oh-my-zsh.	1	# This file integrates the zsh-history-substring-search script into oh-my-zsh.
2		2
3	source "${0:r:r}.zsh"	3	source "${0:r:r}.zsh"
4		4
5	if test "$CASE_SENSITIVE" = true; then	5	if test "$CASE_SENSITIVE" = true; then
6	unset HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS	6	unset HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS
7	fi	7	fi
8		8
9	if test "$DISABLE_COLOR" = true; then	9	if test "$DISABLE_COLOR" = true; then
10	unset HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND	10	unset HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
11	unset HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND	11	unset HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND
12	fi	12	fi
13		13
14		14
15	# Bind terminal-specific up and down keys	15	# Bind terminal-specific up and down keys
16		16	# Bind in both emacs and vi modes so it works in both, and is not
		17	# sensitive to whether this is loaded before or after the vi-mode plugin
17	if [[ -n "$terminfo[kcuu1]" ]]; then	18	if [[ -n "$terminfo[kcuu1]" ]]; then
18	bindkey "$terminfo[kcuu1]" history-substring-search-up	19	bindkey -M emacs "$terminfo[kcuu1]" history-substring-search-up
		20	bindkey -M viins "$terminfo[kcuu1]" history-substring-search-up
19	fi	21	fi
20	if [[ -n "$terminfo[kcud1]" ]]; then	22	if [[ -n "$terminfo[kcud1]" ]]; then
21	bindkey "$terminfo[kcud1]" history-substring-search-down	23	bindkey -M emacs "$terminfo[kcud1]" history-substring-search-down
		24	bindkey -M viins "$terminfo[kcud1]" history-substring-search-down
22	fi	25	fi
23		26
24		27

1	# RVM settings	1	# RVM settings
2	if [[ -s ~/.rvm/scripts/rvm ]] ; then	2	if [[ -s ~/.rvm/scripts/rvm ]] ; then
3	RPS1="%{$fg[yellow]%}rvm:%{$reset_color%}%{$fg[red]%}\$(~/.rvm/bin/rvm-prompt)%{$reset_color%} $EPS1"	3	RPS1="%{$fg[yellow]%}rvm:%{$reset_color%}%{$fg[red]%}\$(~/.rvm/bin/rvm-prompt)%{$reset_color%} $EPS1"
4	else	4	else
5	if which rbenv &> /dev/null; then	5	if which rbenv &> /dev/null; then
6	RPS1="%{$fg[yellow]%}rbenv:%{$reset_color%}%{$fg[red]%}\$(rbenv version \| sed -e 's/ (set.*$//')%{$reset_color%} $EPS1"	6	RPS1="%{$fg[yellow]%}rbenv:%{$reset_color%}%{$fg[red]%}\$(rbenv version \| sed -e 's/ (set.*$//')%{$reset_color%} $EPS1"
7	fi	7	fi
8	fi	8	fi
9		9
10	ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}["	10	ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}["
11	ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}"	11	ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}"
12	ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}"	12	ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}"
13	ZSH_THEME_GIT_PROMPT_CLEAN=""	13	ZSH_THEME_GIT_PROMPT_CLEAN=""
14		14
15	# Customized git status, oh-my-zsh currently does not allow render dirty status before branch	15	# Customized git status, oh-my-zsh currently does not allow render dirty status before branch
16	git_custom_status() {	16	git_custom_status() {
17	local cb=$(current_branch)	17	local cb=$(git_current_branch)
18	if [ -n "$cb" ]; then	18	if [ -n "$cb" ]; then
19	echo "$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_PREFIX$(current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX"	19	echo "$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_PREFIX$(git_current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX"
20	fi	20	fi
21	}	21	}
22		22
23	PROMPT='$(git_custom_status)%{$fg[cyan]%}[%~% ]%{$reset_color%}%B$%b '	23	PROMPT='$(git_custom_status)%{$fg[cyan]%}[%~% ]%{$reset_color%}%B$%b '
24		24

1	# ZSH Theme emulating the Fish shell's default prompt.	1	# ZSH Theme emulating the Fish shell's default prompt.
2		2
3	_fishy_collapsed_wd() {	3	_fishy_collapsed_wd() {
4	echo $(pwd \| perl -pe "	4	echo $(pwd \| perl -pe '
5	BEGIN {	5	BEGIN {
6	binmode STDIN, ':encoding(UTF-8)';	6	binmode STDIN, ":encoding(UTF-8)";
7	binmode STDOUT, ':encoding(UTF-8)';	7	binmode STDOUT, ":encoding(UTF-8)";
8	}; s\|^$HOME\|~\|g; s\|/([^/])[^/]*(?=/)\|/\$1\|g	8	}; s\|^$ENV{HOME}\|~\|g; s\|/([^/.])[^/](?=/)\|/$1\|g; s\|/\.([^/])[^/](?=/)\|/.$1\|g
9	")	9	')
10	}	10	}
11		11
12	local user_color='green'; [ $UID -eq 0 ] && user_color='red'	12	local user_color='green'; [ $UID -eq 0 ] && user_color='red'
13	PROMPT='%n@%m %{$fg[$user_color]%}$(_fishy_collapsed_wd)%{$reset_color%}%(!.#.>) '	13	PROMPT='%n@%m %{$fg[$user_color]%}$(_fishy_collapsed_wd)%{$reset_color%}%(!.#.>) '
14	PROMPT2='%{$fg[red]%}\ %{$reset_color%}'	14	PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
15		15
16	local return_status="%{$fg_bold[red]%}%(?..%?)%{$reset_color%}"	16	local return_status="%{$fg_bold[red]%}%(?..%?)%{$reset_color%}"
17	RPROMPT='${return_status}$(git_prompt_info)$(git_prompt_status)%{$reset_color%}'	17	RPROMPT='${return_status}$(git_prompt_info)$(git_prompt_status)%{$reset_color%}'
18		18
19	ZSH_THEME_GIT_PROMPT_PREFIX=" "	19	ZSH_THEME_GIT_PROMPT_PREFIX=" "
20	ZSH_THEME_GIT_PROMPT_SUFFIX=""	20	ZSH_THEME_GIT_PROMPT_SUFFIX=""
21	ZSH_THEME_GIT_PROMPT_DIRTY=""	21	ZSH_THEME_GIT_PROMPT_DIRTY=""
22	ZSH_THEME_GIT_PROMPT_CLEAN=""	22	ZSH_THEME_GIT_PROMPT_CLEAN=""
23		23
24	ZSH_THEME_GIT_PROMPT_ADDED="%{$fg_bold[green]%}+"	24	ZSH_THEME_GIT_PROMPT_ADDED="%{$fg_bold[green]%}+"
25	ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg_bold[blue]%}!"	25	ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg_bold[blue]%}!"
26	ZSH_THEME_GIT_PROMPT_DELETED="%{$fg_bold[red]%}-"	26	ZSH_THEME_GIT_PROMPT_DELETED="%{$fg_bold[red]%}-"
27	ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg_bold[magenta]%}>"	27	ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg_bold[magenta]%}>"
28	ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg_bold[yellow]%}#"	28	ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg_bold[yellow]%}#"
29	ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[cyan]%}?"	29	ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[cyan]%}?"
30		30

1	function my_git_prompt() {	1	function my_git_prompt() {
2	tester=$(git rev-parse --git-dir 2> /dev/null) \|\| return	2	tester=$(git rev-parse --git-dir 2> /dev/null) \|\| return
3		3
4	INDEX=$(git status --porcelain 2> /dev/null)	4	INDEX=$(git status --porcelain 2> /dev/null)
5	STATUS=""	5	STATUS=""
6		6
7	# is branch ahead?	7	# is branch ahead?
8	if $(echo "$(git log origin/$(current_branch)..HEAD 2> /dev/null)" \| grep '^commit' &> /dev/null); then	8	if $(echo "$(git log origin/$(git_current_branch)..HEAD 2> /dev/null)" \| grep '^commit' &> /dev/null); then
9	STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_AHEAD"	9	STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_AHEAD"
10	fi	10	fi
11		11
12	# is anything staged?	12	# is anything staged?
13	if $(echo "$INDEX" \| command grep -E -e '^(D[ M]\|[MARC][ MD]) ' &> /dev/null); then	13	if $(echo "$INDEX" \| command grep -E -e '^(D[ M]\|[MARC][ MD]) ' &> /dev/null); then
14	STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_STAGED"	14	STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_STAGED"
15	fi	15	fi
16		16
17	# is anything unstaged?	17	# is anything unstaged?
18	if $(echo "$INDEX" \| command grep -E -e '^[ MARC][MD] ' &> /dev/null); then	18	if $(echo "$INDEX" \| command grep -E -e '^[ MARC][MD] ' &> /dev/null); then
19	STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNSTAGED"	19	STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNSTAGED"
20	fi	20	fi
21		21
22	# is anything untracked?	22	# is anything untracked?
23	if $(echo "$INDEX" \| grep '^?? ' &> /dev/null); then	23	if $(echo "$INDEX" \| grep '^?? ' &> /dev/null); then
24	STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED"	24	STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED"
25	fi	25	fi
26		26
27	# is anything unmerged?	27	# is anything unmerged?
28	if $(echo "$INDEX" \| command grep -E -e '^(A[AU]\|D[DU]\|U[ADU]) ' &> /dev/null); then	28	if $(echo "$INDEX" \| command grep -E -e '^(A[AU]\|D[DU]\|U[ADU]) ' &> /dev/null); then
29	STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNMERGED"	29	STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNMERGED"
30	fi	30	fi
31		31
32	if [[ -n $STATUS ]]; then	32	if [[ -n $STATUS ]]; then
33	STATUS=" $STATUS"	33	STATUS=" $STATUS"
34	fi	34	fi
35		35
36	echo "$ZSH_THEME_GIT_PROMPT_PREFIX$(my_current_branch)$STATUS$ZSH_THEME_GIT_PROMPT_SUFFIX"	36	echo "$ZSH_THEME_GIT_PROMPT_PREFIX$(my_current_branch)$STATUS$ZSH_THEME_GIT_PROMPT_SUFFIX"
37	}	37	}
38		38
39	function my_current_branch() {	39	function my_current_branch() {
40	echo $(current_branch \|\| echo "(no branch)")	40	echo $(git_current_branch \|\| echo "(no branch)")
41	}	41	}
42		42
43	function ssh_connection() {	43	function ssh_connection() {
44	if [[ -n $SSH_CONNECTION ]]; then	44	if [[ -n $SSH_CONNECTION ]]; then
45	echo "%{$fg_bold[red]%}(ssh) "	45	echo "%{$fg_bold[red]%}(ssh) "
46	fi	46	fi
47	}	47	}
48		48
49	local ret_status="%(?:%{$fg_bold[green]%}:%{$fg_bold[red]%})%?%{$reset_color%}"	49	local ret_status="%(?:%{$fg_bold[green]%}:%{$fg_bold[red]%})%?%{$reset_color%}"
50	PROMPT=$'\n$(ssh_connection)%{$fg_bold[green]%}%n@%m%{$reset_color%}$(my_git_prompt) : %~\n[${ret_status}] %# '	50	PROMPT=$'\n$(ssh_connection)%{$fg_bold[green]%}%n@%m%{$reset_color%}$(my_git_prompt) : %~\n[${ret_status}] %# '
51		51
52	ZSH_THEME_PROMPT_RETURNCODE_PREFIX="%{$fg_bold[red]%}"	52	ZSH_THEME_PROMPT_RETURNCODE_PREFIX="%{$fg_bold[red]%}"
53	ZSH_THEME_GIT_PROMPT_PREFIX=" $fg[white]‹ %{$fg_bold[yellow]%}"	53	ZSH_THEME_GIT_PROMPT_PREFIX=" $fg[white]‹ %{$fg_bold[yellow]%}"
54	ZSH_THEME_GIT_PROMPT_AHEAD="%{$fg_bold[magenta]%}↑"	54	ZSH_THEME_GIT_PROMPT_AHEAD="%{$fg_bold[magenta]%}↑"
55	ZSH_THEME_GIT_PROMPT_STAGED="%{$fg_bold[green]%}●"	55	ZSH_THEME_GIT_PROMPT_STAGED="%{$fg_bold[green]%}●"
56	ZSH_THEME_GIT_PROMPT_UNSTAGED="%{$fg_bold[red]%}●"	56	ZSH_THEME_GIT_PROMPT_UNSTAGED="%{$fg_bold[red]%}●"
57	ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[white]%}●"	57	ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[white]%}●"
58	ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg_bold[red]%}✕"	58	ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg_bold[red]%}✕"
59	ZSH_THEME_GIT_PROMPT_SUFFIX=" $fg_bold[white]›%{$reset_color%}"	59	ZSH_THEME_GIT_PROMPT_SUFFIX=" $fg_bold[white]›%{$reset_color%}"
60		60