Commit graph

2680 commits

Author SHA1 Message Date
pangratz c0b094cf85 Fix function/alias naming clash between bower and bundle plugin
Since the `bower` plugin specifies a `bi` alias and `bundle` plugin
specifies a `bi` function, there is a name clash when using both
plugins, which results in the message "Can't 'bundle install' outside a
bundled project" when trying to execute `bower`.

This adresses #2486
2014-05-25 11:15:12 +02:00
Simon Courtois b64e695b35 Ordering nocorrect aliases alphabetically 2014-05-24 20:07:06 +02:00
Simon Courtois cd8d5c4410 Defining nocorrect aliases only when ENABLE_CORRECTION is "true"
This commit move the nocorrect aliases definition so they're called
only when the user set ENABLE_CORRECTION to "true" to activate commands
autocorrection.
2014-05-24 20:07:05 +02:00
Simon Courtois 4c64cf4a25 Replacing DISABLE_CORRECTION with ENABLE_CORRECTION in zshrc template
Since commands auto-correction must be explicitly enable with
the ENABLE_CORRECTION envvar, this commit replaces the unaccurate
example in the zshrc template.
2014-05-24 20:07:05 +02:00
Mark Feltner 8d976e02b1 fix(tools/check_for_upgrade): Don't source profile
Reverts #2296, but mostly #1883.

There is no need to source ~/.profile when this script is read. oh-my-zsh writes no configuration data in ~/.profile.

If the user wishes to use data within ~/.profile, then they should source it in another place.

Fixes #2315
2014-05-24 19:51:08 +02:00
Brian Hartvigsen 5e601d6515 Fix dud alias. Switch --max-depth for just -d
As far as I can tell (tested on Linux & Darwin, BSD man page seems to agree), `-d` is pretty univerally accepted as the depth argument.  So instead of doing a test, we can just use -d and call it a day.
2014-05-24 19:48:36 +02:00
Brian Hartvigsen c1f5a1792b This is already done in lib/theme-and-appearance.zsh and supports Darwin/BSD/etc 2014-05-24 19:48:36 +02:00
Adam Luikart 9590b96b3f Write the update file even if CLOBBER is unset. 2014-05-24 19:40:30 +02:00
Trevor Strieber 8355233f7f Fixing typo. 2014-05-24 08:35:54 +02:00
Tony 0b4bf905f5 Minor markup edits 2014-05-24 08:34:22 +02:00
ncanceill 2c19c0e59e typo, fixes #1806 2014-05-24 08:31:59 +02:00
Robby Russell 3913106b2e Merge pull request #2787 from irnnr/plugin-vagrant
Support new Vagrant commands
2014-05-16 09:33:23 -07:00
Ingo Renner 8ed8005102 Improve consistency, remove dots at end of command descriptions 2014-05-15 12:26:39 -07:00
Ingo Renner 30d9952b62 [FEATURE] Support vagrant global-status
Vagrant 1.6 introduced the `global-status` command which allows
to get a quick overview of all active Vagrant environments for the
currently logged in user.
2014-05-06 10:53:12 -07:00
Ingo Renner 7f8ee9aabe [FEATURE] Support Vagrant Cloud commands
Vagrant 1.5 added Vagrant Cloud to share boxes. Some boxes
may be protected, the `login` command allows to access those
protected boxes from Vagrant Cloud.
2014-05-06 10:48:49 -07:00
Ingo Renner 38fe100efe [FEATURE] Support Vagrant Share
Vagrant 1.5 introduced Vagrant Share to allow remote access to a Vagrant
environment. This adds support for the `share` and `connect` commands.
2014-05-06 10:46:55 -07:00
Ingo Renner 236c8de7f3 [FEATURE] Support Vagrant 1.6 version command
Vagrant 1.6 introduces a couple new commands, including the `version` command.
The `version` command shows the currently installed version information and
also checks for new updates available.
2014-05-06 10:45:26 -07:00
Nicolas Brousse 73bf940c34 Update brew.plugin.zsh 2014-04-23 19:44:59 +02:00
Robby Russell eafd5f3252 Merge pull request #1635 from jimhester/per-directory-history
Update to latest per-directory-history
2014-04-19 12:56:21 -07:00
Robby Russell 11bf1a3a29 Merge pull request #2681 from mcornella/fix-zsh_reload-plugin
Various fixes on zsh_reload plugin
2014-04-19 12:55:56 -07:00
Robby Russell 4509228c53 Merge pull request #2728 from benwong/patch-2
Spelling correction in itunes control function.
2014-04-19 12:55:30 -07:00
Robby Russell 59de9aaa65 Merge pull request #2671 from ukrutt/master
Correct redirection of stderr
2014-04-19 12:55:09 -07:00
Robby Russell 01dcf51fdf Merge pull request #2502 from UniIsland/patch-1
`fc -l 1` instead of `history` in zsh_stats, fixes #2501
2014-04-19 12:54:35 -07:00
Robby Russell 5eb5f7138a Merge pull request #2511 from FloFra/master
Makes history-substring-search use term specific up and down buttons.
2014-04-19 12:54:10 -07:00
Robby Russell 8aa6e6a412 Merge pull request #2650 from kemko/patch-1
don't add --exclude-dir to GREP_OPTIONS on FreeBSD
2014-04-19 12:53:42 -07:00
Robby Russell ee31abfb2d Merge pull request #2729 from grodzik/master
Fix for Python3
2014-04-19 07:15:04 -07:00
Robby Russell 3b830aac8c Merge pull request #2693 from javiertejero/master
Fix `docker rmi` tab completion
2014-04-19 07:14:39 -07:00
Javier Tejero 7949a1cd8d Fix docker rmi tab completion
This is exactly what happens on tab completion for docker rmi. This commit
fixes that.

```sh
$ docker rmi <hit TAB>
_arguments:comparguments:312: invalid argument: __docker_images
_arguments:comparguments:312: invalid argument: __docker_images
_arguments:comparguments:312: invalid argument: __docker_images
```
2014-04-19 09:03:28 +02:00
Paweł Tomak cee52283d8 Fix for Python3
In Python3 without universal_newlines set to True
output from Popen was byte-encoded.
2014-04-18 23:09:38 +02:00
Dmitriy 9385b3ee0a set exclude-dir or exclude grep flags only if available 2014-04-19 00:03:36 +04:00
Marc Cornellà fcfa323974 Use cache folder inside $ZSH, delete with unaliased rm 2014-04-18 17:07:23 +02:00
Benjamin Wong 6f3cf195c6 Spelling correction in itunes control function.
Spelling correction in itunes control function.
2014-04-18 22:43:23 +10:00
Robby Russell a9061f34d7 Merge pull request #2633 from redsunsoft/agnoster-theme-git-mode-addition
Added git support for merging, rebasing, and bisecting to agnoster theme
2014-04-17 19:57:23 -07:00
Robby Russell f8f01262ab Merge pull request #2685 from delynn/patch-2
Remove mailcatcher from bundler plugin
2014-04-05 08:01:29 -07:00
DeLynn Berry 7d696f79b8 Remove mailcatcher
The mailcatcher gem does not work correctly when executed through Bundler.
2014-04-04 08:11:11 -06:00
Robby Russell 00d6ef8a31 Merge pull request #2329 from pstadler/brew-cask
add brew-cask plugin
2014-03-31 07:57:25 -07:00
Henrik Holm f46d06dae1 Correct redirection of output from 'hash'
The intention of the redirection to /dev/null is to hide the output
'hash: no such command: git' since we rely on the exit status.

However, the output goes to stderr, so it's stderr that needs to be
redirected. For completeness, we redirect both stderr and stdout using
'2>&1'.

Example:

  [~]$ hash git > /dev/null
  [~]$ PATH=''
  [~]$ hash git > /dev/null
  hash: no such command: git
  [~]$ hash git > /dev/null 2>&1
  [~]$
2014-03-30 10:34:13 -04:00
Stanislav Schultz b2ea7d3ec1 Add Ruby 2.1.1 support to rvm plugin 2014-03-28 20:25:13 +03:00
Robby Russell 70dfb91b98 Merge pull request #2663 from bobmaerten/docker-autocomplete-updates
Docker autocomplete plugin is not up to date with recent versions.
2014-03-27 21:33:49 -07:00
Robby Russell fe73f8d5b1 Merge pull request #2651 from jehrhardt/fix-emacs
Fix Emacs plugin
2014-03-27 21:32:58 -07:00
Robby Russell 175310ae27 Merge pull request #2661 from mcornella/fix_title_tab_percent
Fix escaping of $CMD of automatic title
2014-03-27 21:31:04 -07:00
Robby Russell ae0c6507e4 Merge pull request #2659 from simonc/allowing-pow-path-with-spaces
Allowing path with spaces in pow plugin
2014-03-27 21:30:38 -07:00
Robby Russell 861d380aa3 Merge pull request #2658 from leifcr/rake-fast-issue
Plugin: Rake-fast: Support both *nix and Darwin
2014-03-27 21:29:36 -07:00
Robby Russell 27c28a94af Merge pull request #2647 from bobwilliams/master
Adding a README.md for plugins/jsontools
2014-03-27 21:22:03 -07:00
Robby Russell 78967b604d Merge pull request #2656 from philenotfound/master
New aliases for 'apt-get' and 'aptitude' as they were overwritten by lat...
2014-03-27 21:21:24 -07:00
Robby Russell a6b9597373 Merge pull request #2652 from lukehorvat/patch-1
Fixed typos + made wording more consistent in zshrc.zsh-template
2014-03-27 21:19:42 -07:00
Robby Russell a5f6f72b66 Merge pull request #2660 from KevinBongart/add-readme-to-rake-fast
Add README file to rake-fast plugin
2014-03-27 21:18:28 -07:00
Robby Russell 9c1241a680 Merge pull request #2662 from aeriksson/master
Fix broken reverse-menu-complete keybinding.
2014-03-27 21:18:02 -07:00
Bob Williams 400643ff5b adding urldecode_json to compliment urlencode_json and updating readme.md; slight tweak to urlencode_json from previous commit 2014-03-27 10:34:54 -04:00
Bob Williams 0605d53fa7 adding urlencode_json and associated README.md details 2014-03-26 18:47:57 -04:00