1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-04 19:50:08 +00:00
Commit graph

4443 commits

Author SHA1 Message Date
Robby Russell
7a531666dc Merge pull request #3076 from robbyrussell/revert-2766-add-contributing-file
Revert "Add a CONTRIBUTING file to instruct people on issues and pull re...
2014-09-01 13:00:06 +02:00
Robby Russell
39fb6c9d35 Revert "Add a CONTRIBUTING file to instruct people on issues and pull requests" 2014-09-01 12:59:47 +02:00
Robby Russell
fdba0f43f5 Merge pull request #3069 from johnjohndoe/feature/adb-autocompletion
Add README.md for adb-autocompletion plugin.
2014-09-01 12:59:17 +02:00
Joshua Medeski
b8e10ca16d add wp-cli plugin readme 2014-08-31 23:33:43 -05:00
AJ Henriques
f0d5cfdc33 add git difftool alias (gdt) 2014-08-31 20:30:42 -07:00
Letian Zhang
9c1255d358 fix missing add-zsh-hook in pygmalion.zsh-theme
Fix "command not found: add-zsh-hook" since #3053 removes `autoload -U add-zsh-hook`
2014-09-01 09:49:31 +08:00
Halil Özgür
2b83accbf8 Use the library function for ruby prompt
Not everyone uses rvm and the library has already got a function for this.
2014-09-01 04:14:03 +03:00
Michael Stucki
e7fdb028b5 Improve support for Vagrant VM definitions 2014-08-31 23:50:59 +02:00
Tobias Preuss
65f97a66c7 Add README.md for adb-autocompletion plugin. 2014-08-31 21:42:49 +02:00
Robby Russell
23bbf3cc2b Merge pull request #2986 from Guerki/master
Run web-search in background
2014-08-31 12:16:38 -07:00
Robby Russell
6cb8b720b3 Merge pull request #2995 from admpsktt/patch-2
Update README.textile
2014-08-31 12:14:16 -07:00
Robby Russell
56d9acfbaf Merge pull request #3044 from alexshd/patch-1
Resets the font colour to original
2014-08-31 12:11:05 -07:00
Robby Russell
99fde07b8f Merge pull request #3000 from bigtiger/add-git-add-patch
Add gap (git add --patch)
2014-08-31 12:10:04 -07:00
Robby Russell
1f9b24e56b Merge pull request #2997 from cchacin/master
TomEE maven plugin + integration-test in common life-cycle
2014-08-31 12:08:08 -07:00
Robby Russell
4438acb3f1 Merge pull request #3004 from admpsktt/patch-3
Update half-life.zsh-theme
2014-08-31 12:06:13 -07:00
Robby Russell
eae6c38ea8 Merge pull request #3010 from celsomiranda/patch-1
Add support for local aur databases
2014-08-31 11:46:07 -07:00
Robby Russell
244a6f23e5 Merge pull request #3011 from cherrry/master
rounding to emoji clock
2014-08-31 11:45:10 -07:00
Robby Russell
58491bda21 Merge pull request #3012 from abstractj/git-gpg-signatures
Inclusion of aliases for sign git commits and tags
2014-08-31 11:44:57 -07:00
Robby Russell
74e7510a7d Merge pull request #3014 from allister-lundberg/git_alias_gitbranchremote
New alias for git plugin: gbr == git branch --remote
2014-08-31 11:43:59 -07:00
Robby Russell
c1cd9cb126 Merge pull request #3049 from strycore/master
Prevent chsh from running when $SHELL is already zsh
2014-08-31 11:42:40 -07:00
Robby Russell
fc365f5bdc Merge pull request #2963 from bezoerb/symfony2-autocomplete-fix
#2914 fixed symfony2 autocomplete
2014-08-31 11:36:08 -07:00
Robby Russell
5e842cf4f1 Merge pull request #3041 from takac/master
Update jira plugin to allow lookup of issues
2014-08-31 11:34:12 -07:00
Robby Russell
6908827035 Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2014-08-31 11:32:21 -07:00
Robby Russell
671bd0cf4f Link to swag in installer... shameless profiting 2014-08-31 11:32:07 -07:00
Robby Russell
9f8d7d85c2 Adding link to the store for swag in upgrade process 2014-08-31 11:30:30 -07:00
Robby Russell
c22658e15d Merge pull request #3059 from chrisfsmith/feature/bbedit
Adding BBEdit plugin (OS X only)
2014-08-31 11:26:14 -07:00
Robby Russell
b88d68279e Merge pull request #3060 from chrisfsmith/feature/marked
Adding Marked 2 plugin (OS X only)
2014-08-31 11:25:58 -07:00
Robby Russell
3577fba612 Merge pull request #3058 from chrisfsmith/feature/textastic
Adding Textastic plugin (OS X only)
2014-08-31 11:25:29 -07:00
Robby Russell
c207c83968 Merge pull request #1755 from johnjohndoe/feature/adb-autocompletion
Add autocompletion for adb
2014-08-31 11:04:55 -07:00
Chris Smith
9bf5b90c81 Adding README.md and renaming plugin 2014-08-31 13:01:21 -05:00
Robby Russell
c07bf981c3 Merge pull request #1504 from jediant/master
Exit early from git plugin if not in git repo.
2014-08-31 10:59:55 -07:00
Chris Smith
d7f77f818d Adding README.md 2014-08-31 12:56:23 -05:00
Chris Smith
a8dad6fa87 Adding README.md 2014-08-31 12:55:46 -05:00
Robby Russell
6caed46356 Merge pull request #2941 from mcornella/fix-pass-completion
Update pass completion and fix syntax and autoloading
2014-08-31 10:55:35 -07:00
Robby Russell
3e30b4d2d1 Merge pull request #2922 from ncanceill/easymerge
Easy-to-Merge via @ncanceill... our hero!
2014-08-31 10:46:31 -07:00
Robby Russell
fcd55f3a92 Merge pull request #2845 from mfaerevaag/master
[wd] New minor release
2014-08-31 10:45:40 -07:00
Robby Russell
958c8f4390 Merge pull request #3045 from fornwall/remove-usr-bin
Replace /usr/bin/env with env
2014-08-31 10:40:19 -07:00
Robby Russell
be578d9e7a Merge pull request #3053 from jingweno/patch-1
Fix missing add-zsh-hook
2014-08-31 10:39:03 -07:00
Robby Russell
a5cbd31074 Merge pull request #3065 from posva/tmuxinator-update
Update tmuxinator autocompletion
2014-08-31 10:38:31 -07:00
Robby Russell
686f29f07d Merge pull request #3052 from DariusPHP/master
#git plugin git diff-tree --name-only added
2014-08-31 10:28:28 -07:00
Robby Russell
a1c5abf6bf Merge pull request #3055 from sachin21/remove_alias
This alias is conflict cause.
2014-08-31 10:25:34 -07:00
Robby Russell
4641130357 Merge pull request #3068 from nervo/patch-1
Add Composer's local binaries to PATH
2014-08-31 10:23:28 -07:00
Robby Russell
b43e8ab723 Merge pull request #3057 from igorzoriy/master
Added 'uninstall' command to brew completion
2014-08-31 10:18:30 -07:00
Robby Russell
6d5d67a35d Merge pull request #3067 from tacgnol/AWS
Fix issue with homebrew installed awscli
2014-08-31 10:17:21 -07:00
Robby Russell
e425ddc0ef Merge pull request #2766 from mcornella/add-contributing-file
Add a CONTRIBUTING file to instruct people on issues and pull requests
2014-08-31 10:16:28 -07:00
nervo
14f055d0bb Add Composer's local binaries to PATH 2014-08-31 15:41:02 +02:00
Douglas S.D. Hall
f492207329 Amended to source the original aws_zsh_completer.sh rather than
the mangled version installed into $(brew-prefix)/bin if using
homebrew installed awscli on OSX.

This was discussed here - https://github.com/Homebrew/homebrew/issues/30268
2014-08-30 17:20:28 +01:00
Eduardo San Martin Morote
cd98283a92 tmuxinator completion update:
Current completion plugin isn't up to date and #2075 PR, which is also
the completion plugin on the official tmuxinator repository, doesn't
work. Thus this should do the trick for the moment.
Also suppressed an error when no completion is available
2014-08-29 10:40:08 +02:00
Marc Cornellà
142a6c7fd5 Fix pass zsh completion and autoloading
When autocompleting from `pass <TAB>', sometimes the following errors
appear:

  _values:compvalues:10: not enough arguments
  find: `/home/user/.password-store': No such file or directory
  _values:compvalues:10: not enough arguments
  find: `/home/user/.password-store': No such file or directory

The `_values' error happens when there is no password-store folder *or*
there are no passwords in pass; the `find' error only when there is no
password-store folder.

We can trace it back to line 108, which contains the only `_values'
statement that is executed when we autocomplete from pass. We confirm
this by following the trail of execution, which is

  _pass -> _pass_cmd_show -> _pass_complete_entries ->
        -> _pass_complete_entries_helper

If we try running the command inside `$()' on line 104, we see that it
returns nothing and the output is blank. This means that `_values' only
receives 1 of its 2 mandatory parameters, therefore the above error is
triggered (not enough arguments).

That is unless we don't have a password-store folder, in which case the
`find: [...] no such file or directory' error is *also* triggered.

We solve the first error by supplying a default value of "" if the
command outputs nothing, using the zsh construct ${var:-else}.

We solve the second error by redirecting the find command's stderr output
to /dev/null, so the error is effectively suppressed.

* * * *

This patch also fixes the first tab completion, which currently only
loads the completion function definition.

We do this by adding a `_pass' statement at the end of the file, which
runs the `_pass' completion function after loading its definition.
This is the standard way an autoloaded function works; for other examples
look at zsh's official completion files.
2014-08-29 00:39:33 +02:00
Marc Cornellà
17dd5792b4 Update pass completion to upstream
Conflicts:
	plugins/pass/_pass
2014-08-29 00:39:33 +02:00