Commit graph

3234 commits

Author SHA1 Message Date
Robby Russell
c78277fd8b Merge pull request #3429 from apjanke/termsupport-apple-chpwd
termsupport: add chpwd hook for setting pwd in Apple Terminal.app
2015-01-09 02:45:12 -06:00
Stephen
ceb42ecdb6 Update /home/srj/.oh-my-zsh/cache references 2015-01-08 16:38:05 +00:00
Stephen
bf7b9165fd Allow custom cache dir
We are running oh-my-zsh on a shared install and the only issue is each
user having a custom cache dir. This will allow us to set the cache dir
to ZSH_CACHE_DIR=~/oh-my-zsh/cache/ .
2015-01-08 16:01:16 +00:00
Jyrki Pulliainen
833e6f5958 virtualenvwrapper: Deactivate only if in virtualenv
If user manually deactivates the virtualenv when using this mode, zsh
will produce following error:

    deactivate:12: command not found: virtualenv_deactivate

To avoid this, check that the VIRTUAL_ENV flag is set before trying to
automatically deactivate the virtual environment.

Fixes #2185
2015-01-07 18:17:29 +01:00
zghember
8105d4acc9 Merge commit '175b4a807383530aa75145b5b6fdedb3ce1f11f2' 2015-01-03 14:41:34 +08:00
rexk
8790fa3723 go plugin upgrade for version 1.4 2014-12-30 14:53:31 -08:00
liuxiang
957564ab9f Add completion for httpie 2014-12-27 23:56:57 +08:00
Andrew Janke
7295e38885 termsupport: add chpwd hook for setting pwd in Apple Terminal.app 2014-12-21 15:05:22 -05:00
Robby Russell
175b4a8073 Merge pull request #3407 from rawberg/mira-theme
mira theme shows active node, ruby and java versions
2014-12-20 12:41:25 -08:00
Robby Russell
da1ca8876e Merge pull request #3404 from ekaragodin/master
Added Yii2 command completion
2014-12-20 12:40:47 -08:00
Robby Russell
0c47d8cfe4 Merge pull request #3146 from typekpb/tmux-aliases
additional tmux aliases
2014-12-20 12:38:43 -08:00
Robby Russell
304e8f0480 Merge pull request #3338 from eripa/chruby_fix
Fix chruby plugin to not complain if chruby is *not* installed
2014-12-20 12:37:18 -08:00
Robby Russell
b0ad3d7c70 Merge pull request #3352 from benjaoming/virtualenvwrapper_workon_unset
Throw an error message when $WORKON_HOME is not set
2014-12-20 12:37:05 -08:00
Robby Russell
fe2ccb30af Merge pull request #3397 from peteches/master
Fixed output issues webith websearch plugin.
2014-12-20 12:36:27 -08:00
Robby Russell
c63f27a9f2 Merge pull request #3412 from mcornella/feltnerm-patch-1
Disable sourcing .profile when checking for available updates
2014-12-19 20:31:49 -08:00
Robby Russell
5167450ef9 Merge pull request #3424 from bergvandenp/docker_exec
added exec command to docker plugin
2014-12-19 20:30:59 -08:00
Robby Russell
4a56c6b30b Merge pull request #3303 from iml/brew-update
Remove deprecated brew commands, update core commands
2014-12-19 20:27:54 -08:00
Robby Russell
1b2d7fd9e9 Merge pull request #3362 from emarashliev/master
Added Xcode alias for deleting Derived Data.
2014-12-19 20:26:50 -08:00
Robby Russell
dc9af89669 Merge pull request #3372 from bbiao/compatible-with-new-autojump
autojump installed from github has mv the autojump.zsh to $HOME/.autojum...
2014-12-19 20:26:08 -08:00
Robby Russell
9b352030b7 Merge pull request #3409 from unixorn/prevent-variable-clobbering
Add quoting to nvm.sh
2014-12-19 20:21:33 -08:00
Robby Russell
9e794a5d3e Merge pull request #3410 from Superbil/master
Fix aws.plugins.zsh check rule
2014-12-19 20:20:21 -08:00
Robby Russell
cd845a1ffd Merge pull request #3417 from stof/patch-1
Update the list of Heroku Postgres commands
2014-12-19 20:19:26 -08:00
Paul van den Berg
9e5f0f0e9d added exec command to docker plugin 2014-12-18 23:22:48 +01:00
Joe Block
16d0768305 Quote path in case $HOME has a space in it.
I've seen stranger things on OS X, unfortunately.
This reverts commit 1f5cecee4768be192e439a72a873a6cfe8720927.
2014-12-16 13:22:31 -08:00
Christophe Coevoet
f7deb52c47 Update the list of Heroku Postgres commands 2014-12-16 17:35:08 +01:00
Mark Feltner
83553597a1 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-12-15 18:45:50 +01:00
Superbil
7931d5ce1a
Fix aws.plugins.zsh check rule
Check _aws_zsh_completer_path had exist or not
2014-12-16 00:51:22 +08:00
Robby Russell
1978a0923c Revert PR #3359 as this is breaking stuff for many folks. Need to rethink how we handle system defaults differently on this 2014-12-15 08:11:04 -08:00
ekaragodin
00ff1bbd1c Updated Yii2 command completion 2014-12-15 21:37:38 +06:00
David Feinberg
02d647773a added node- before node version for consistency 2014-12-14 18:28:06 -08:00
David Feinberg
77da20997e mira theme shows active node, ruby and java versions 2014-12-14 18:19:00 -08:00
ekaragodin
7488e9b510 Add yii2 readme 2014-12-15 08:18:18 +06:00
Robby Russell
0a96bb1577 Merge pull request #2094 from frantzmiccoli/phing-fix
Phing plugin improvment
2014-12-14 16:44:06 -08:00
Robby Russell
fe75c968ef Merge pull request #3399 from ryan-robeson/add-itunes-shuffle-command-to-osx-plugin
Add itunes shuffle command to OSX plugin.
2014-12-14 16:35:45 -08:00
Robby Russell
77bfdc69ab Merge pull request #3395 from vmalloc/patch-1
Fix dircycle plugin
2014-12-14 16:35:02 -08:00
Robby Russell
07c013c671 Merge pull request #3389 from bubenkoff/add-current-bookmark-rkj-repoz
add current bookmark to rkj-repos theme
2014-12-14 16:34:49 -08:00
Robby Russell
885e8187ad Merge pull request #3359 from unixorn/dont-clobber-histsize-and-savehist
Don't clobber $HISTSIZE and $SAVEHIST
2014-12-14 16:34:08 -08:00
Robby Russell
eced76e0fd Merge pull request #3326 from DanielFGray/master
ignore any grep aliases that might be defined
2014-12-14 16:32:11 -08:00
Robby Russell
311f3630d4 Merge pull request #3403 from mcornella/fix-grep-library
Fix grep.zsh library
2014-12-14 16:31:54 -08:00
Robby Russell
8efdbef778 Merge pull request #3366 from ratza/master
Fix for command autocomplete for Symfony 2.6.x
2014-12-14 16:28:18 -08:00
zghember
6fd0b73e9a Merge commit '141c2e593401f245a9f9bb0799ada8bf14b677d7' 2014-12-15 00:23:34 +08:00
ekaragodin
08b9f8d677 Added Yii2 command completion 2014-12-14 11:43:52 +06:00
Ondřej Súkup
dd27087805 Change to alias and remove deprecated GREP_COLOR 2014-12-13 19:57:23 +01:00
Marc Cornellà
711843153d Tidy up the grep.zsh library 2014-12-13 19:52:49 +01:00
Marc Cornellà
0190eb084b Use unaliased grep in flag check 2014-12-13 19:45:04 +01:00
Marc Cornellà
cf586b54b8 Ignore .bzr folders in grep too 2014-12-13 19:45:02 +01:00
Marc Cornellà
0bd3c9996f Extract VCS folders definition to avoid repetition 2014-12-13 19:44:38 +01:00
Robby Russell
141c2e5934 Merge pull request #3344 from wrboyce/custom-lib
allow overriding lib/*.zsh in custom/lib
2014-12-12 17:45:09 -08:00
Ryan Robeson
43a2e24c25 Add itunes shuffle command to OSX plugin.
Added shuffle functionality to the itunes command in the OSX plugin.
iTunes 12 doesn't support setting the "shuffle" property on the playlist
from what I've read, so this simulates the user interacting with the
iTunes interface. The toggle option "clicks" the shuffle button in the
Now Playing area. This has the effect of toggling the shuffle setting on
whatever is currently playing. The on and off options use the Shuffle
menu bar items.

Usage: itunes shuffle [on|off|toggle]
2014-12-12 17:48:17 -05:00
Pete "Peteches" McCabe
1d2c1e8ab8 Fixed output issues webith websearch plugin.
- if user has rm set as an alias to 'rm -i' user is prompted to whether to
  remove the nohup.out file.

 $ ddg fools
	nohup: ignoring input and appending output to ‘nohup.out’
	rm: remove regular empty file ‘nohup.out’?

- if output redirected to a file nohup will not create nohup.out and rm is
  unecessary.
2014-12-12 17:37:35 +00:00