dolysis/ohmyzsh
3
0
Fork 0
Code Issues Pull requests Releases Activity
3494 commits 2 branches 0 tags 133 MiB
Commit graph

408 commits

Author SHA1 Message Date
Marc Cornellà 0edf416bea Temporarily delete over-engineered solution 2015-02-10 20:38:06 +01:00
frozen_dude 448e966129 Fix for bad LC_CTYPE entry 
LANG is a colon-separated list of prefered locales; LC_CTYPE is single entry,
therefore we need to remove all but one entry.

Also, there is no need setting it if it is already set (LC_ALL also sets
LC_CTYPE, so we check it too).
 2015-02-10 20:37:35 +01:00
Marc Cornellà 2e41d06b76 Use quoted $TERM value everywhere 2015-02-10 19:53:40 +01:00
Marc Cornellà b7e5dd35ef Quick-fix code style 2015-02-10 19:52:58 +01:00
Andrew Janke 4fc6dccb42 term: Move DISABLE_AUTO_TITLE check to hooks 
Move the DISABLE_AUTO_TITLE check from title() to the preX hook
functions that call it, to allow the title() function to be used
directly by user or other callers.
 2015-02-10 19:38:11 +01:00
Marc Cornellà 2193135ebc Clean up appearance lib file and redundant colors calls in other files 2015-02-10 19:22:50 +01:00
Marc Cornellà 51946eb3ce Implement deletion of sl alias as per #3055 2015-02-10 19:22:39 +01:00
LFDM 4b4292a496 Fix a typo 2015-02-10 19:22:39 +01:00
LFDM 83c4e06206 Moves a bindkey call from misc to key-bindings. 2015-02-10 19:22:39 +01:00
LFDM 101149b1ae Moves remaining aliases to misc and deletes file. 
There were only three aliases left in aliases.zsh
File deleted!
 2015-02-10 19:22:39 +01:00
LFDM d33b0aae91 Refactors history alias and moves it. 
More compact case statement instead of the ugly if elif... else
statement. Moves it to history.zsh
 2015-02-10 19:22:39 +01:00
LFDM 25b1cd687b Brings all directory stuff to directories.zsh 
- Cleans out aliases.zsh.
- Removes unneeded cd function.
 2015-02-10 19:22:38 +01:00
Robby Russell c3eb54839a Merge pull request #3525 from apjanke/term-pwd-in-precmd 
Move pwd update output to precmd to avoid contamination
 2015-02-10 07:27:03 -08:00
Andrew Janke be7028012e Reword comments on termsupport internal functions. 2015-02-04 01:00:51 -05:00
The Linux Kitten f2130fa1a3 Test if --color=auto is a valid option for grep 2015-02-02 20:49:24 +01:00
Robby Russell 550ccca91c Merge pull request #3478 from stephenrjohnson/custom_cache_dir 
Allow custom cache dir
 2015-01-31 06:23:50 -06:00
Andrew Janke 5f79ab5547 Move chpwd update output from chpwd hook to precmd to avoid 
contaminating script/function output
 2015-01-27 21:00:07 -06: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
Andrew Janke 7295e38885 termsupport: add chpwd hook for setting pwd in Apple Terminal.app 2014-12-21 15:05:22 -05: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
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
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
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
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
Joe Block 5bf715787a Existing code indents with spaces, not tabs, conform. 2014-11-30 17:39:21 -08:00
Joe Block 1ebc98b9ed Don't clobber HISTSIZE or SAVEHIST if they're already set 2014-11-30 17:37:47 -08:00
Marc Cornellà a301f567e3 Switch back to oh-my-zsh.hide-dirty setting again 
Commit 81004dfaba reverted the change
in 9b811fb625 when editing the merge
conflict from #2928.

This commit fixes that so that we don't make the same mistake again.

First seen in http://git.io/Cdaj5Q
 2014-11-19 18:40:18 +01:00
DanielFGray 00ec11d3c0 ignore any grep aliases that might be defined 2014-11-16 02:47:35 -06:00
Marc Cornellà 74177c5320 Change all whoami calls for $USER variable 
This avoid spawning additional processes, as the $USER variable will
**always** contain the current logged-in user.
 2014-11-06 18:33:56 +01:00
Robby Russell 57ff83db59 Merge pull request #2946 from moinakg/master 
Solaris portability tweaks.
 2014-11-06 09:26:48 -08:00
Robby Russell 81004dfaba 2928 merge conflict 2014-11-06 09:24:00 -08:00
Robby Russell 160abc9a8d Merge pull request #2323 from michaelorr/slow-git-fix 
Renaming config for parse_git_dirty() to avoid collision
 2014-11-06 09:15:00 -08:00
Marc Cornellà 36e05e95ad Don't set auto_name_dirs because it messes up prompts 
From http://zsh.sourceforge.net/Doc/Release/Options.html#Completion-4

> AUTO_NAME_DIRS
> Any parameter that is set to the absolute name of a directory immediately
> becomes a name for that directory, that will be used by the ‘%~’ and
> related prompt sequences, and will be available when completion is performed
> on a word starting with ‘~’.
> (Otherwise, the parameter must be used in the form ‘~param’ first.)

Explained in more detail in
https://github.com/wayneeseguin/rvm/issues/3091#issuecomment-60083194

Related issues:
https://github.com/robbyrussell/oh-my-zsh/issues/2857
https://github.com/robbyrussell/oh-my-zsh/issues/3238
https://github.com/wayneeseguin/rvm/issues/3091
 2014-10-22 15:39:27 +02:00
Moinak Ghosh 5f38a537ce Update Solaris changes to use OSTYPE and zsh datetime module. 2014-09-16 22:29:52 +05:30
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 a1c5abf6bf Merge pull request #3055 from sachin21/remove_alias 
This alias is conflict cause.
 2014-08-31 10:25:34 -07:00
sachin21 ac053f4211 This alias is conflict cause 2014-08-24 00:50:54 +09:00
Jingwen Owen Ou dc9e1764cf Fix missing add-zsh-hook 
In older version of zsh, `add-zsh-hook` is not available, causing issues like:

```
/Users/hugo/.oh-my-zsh/lib/termsupport.zsh:32: add-zsh-hook: function definition file not found
/Users/hugo/.oh-my-zsh/lib/termsupport.zsh:33: add-zsh-hook: function definition file not found
```

See https://github.com/robbyrussell/oh-my-zsh/issues/748. This patch pulls in the changes suggested in https://github.com/robbyrussell/oh-my-zsh/issues/748#issuecomment-37862691 by @mcornella and I have tested it on RHEL 5.
 2014-08-22 15:59:17 -07:00
Fredrik Fornwall dac2a6e27a Replace /usr/bin/env with env 
Some environments (such as Android) does not have /usr/bin.
 2014-08-20 23:52:05 +02:00
Robby Russell 01da53e10f Merge pull request #2828 from r3dDoX/master 
removed a hardcoded 'origin' in git.zsh and added new function for number of commits ahead of remote
 2014-07-15 07:38:55 -07:00
Moinak Ghosh 5e328e3a9c Solaris portability tweaks. 2014-07-11 18:41:49 +05:30
Simon Buchan 2927ce3714 Fix POST_1_7_2_GIT check for parse_git_dirty submodules. 2014-07-03 14:45:49 +12:00
Simon Buchan 676fb4e420 Fix parse_git_dirty() when status.branch is set. 2014-07-03 14:38:19 +12:00
Albert Krewinkel c5d9fc9968 git_prompt_info: ignore git-config errors 
Merged from #2906

The function `git_prompt_info` calls `git config` for its stdout output,
but doesn't handle the stderr output.  This can lead to problems,
e.g. if the git config file is unreadable for some reason (permissions
etc).

This fixes the issue by simply ignoring the stderr output.
 2014-06-28 10:12:20 +02:00
Mikhail S. Pobolovets 49161e7847 Add missing command wrapper for git 
Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
 2014-06-28 10:12:19 +02:00
Will Boyce 09fdf76311 ignore usernames beginning with underscore 2014-06-10 13:33:33 +02:00
ncanceill 7fbbf28e6e return 0 when not a git repo 
before, 128 was returned, which could display an error,
but out of a git repo this should exit silently
fixes #2226
 2014-06-10 09:52:57 +02:00
Andrea De Pasquale 12324856c6 Added ssh-like mosh window title 
Display the hostname when running Mosh (http://mosh.mit.edu/).
Same thing as displaying "hostname" when running "ssh hostname".
 2014-06-05 23:27:59 +02:00
r3dDoX 514693125b added prefix/suffix variable for customizability 2014-05-26 10:47:51 +02:00
r3dDoX 59c8fcc712 added new function to get number of commits ahead of remote 2014-05-25 14:13:21 +02:00
r3dDoX 3c485db8c7 replaced hardcoded origin/{branch-name} with @{upstream} which gets the upstream branch since git 1.7.0 2014-05-25 14:13:07 +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
drm00 f516b7c7f5 add check for colored ls on openbsd. (retry of #2225) 2014-04-25 14:15:14 +02: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 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
Dmitriy 9385b3ee0a set exclude-dir or exclude grep flags only if available 2014-04-19 00:03:36 +04: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
Andre Eriksson 9650861e56 Fix broken reverse-menu-complete keybinding. 
Since e537ee9, the reverse-menu-complete keybinding has no longer been
properly bound (it was accidentally bound to the delete key).

This commit again binds it to shift-tab.
 2014-03-26 15:12:39 +09:00
Marc Cornellà 5137e0e509 Escape % in $CMD variable 
Fixes formatting on some rare cases when a percent ends up
in the $CMD variable, like these below:

- When assigning a variable, $CMD ends up with the second parameter;
in this case, $CMD will contain '+%s%N', messing with the syntax:

 $ a=`date +%s%N`

- A function (or command in general) that contains a percent symbol:

 $ to\%() { echo $(( $1 * 100 / $3))\% } # $CMD=to%()
 $ to% 2 of 10 # $CMD=to%
 2014-03-25 21:14:20 +01:00
Robby Russell 27965fedec Merge pull request #2390 from LFDM/updating_spectrum 
Updates and refactors spectrum.zsh
 2014-03-23 11:39:07 -07:00
Marc Cornellà 12e30faaca Fix export syntax of $GREP_OPTIONS 
Fixes #2641, #2642
 2014-03-23 02:09:38 +01:00
Robby Russell 393c805f7e Merge pull request #1162 from nXqd/patch-1 
avoid VCS folders
 2014-03-22 16:07:51 -07:00
Robby Russell 9eacd7d589 Merge pull request #750 from blueyed/history-drop-default-append-history 
`setopt append_history` is not necessary.
 2014-03-22 13:59:19 -07:00
Alexei Danchenkov 32a7824182 Added a forward-delete fallback to bind Delete key 
Delete key (of Fn+Delete on Mac) would print "~" instead of deletion.
 2014-03-21 09:24:59 -07:00
Alexei Danchenkov c5413d7dd1 Aligned comments 2014-03-20 19:34:43 -07:00
Alexei Danchenkov 55a9d685fd Update key-bindings.zsh 
Aligned comments
 2014-03-20 19:29:06 -07:00
Alexei Danchenkov e537ee9db9 added terminfo keys verification 2014-03-20 19:10:44 -07:00
Mariusz Fik b56e8fb478 Ignore more users in ssh completion. 
Signed-off-by: Mariusz Fik <fisiu@opensuse.org>
 2014-03-16 18:14:34 +01:00
Robby Russell c9e7129341 Merge pull request #2602 from blueyed/use-default-hosts-completion-2 
Use zsh's default for ':completion:*:hosts'
 2014-03-15 16:03:30 -07:00
Robby Russell 552aab6939 Merge pull request #2591 from kevinxucs/remove-extra-aliases 
Removed unsolicited aliases.
 2014-03-13 13:29:12 -07:00
Daniel Hahler 71d9420637 Use zsh's default for ':completion:*:hosts' 
The manual configuration of ':completion:*:hosts' causes some problems
(e.g. issue #1337), and misses useful information (especially from
~/.ssh/known_hosts; issue #690 and issue #1009).

The best option appears to be using zsh's default configuration for
':completion:*:hosts'.

While rebasing this for a new pull request (#1498 got closed by accident
and then requests to re-open it got ignored), it also drops the `users
off` setting: completion of user names can be useful, and the commit
adding it (c4434d2) does not state why.
 2014-03-13 17:48:58 +01:00
Robby Russell 7adf66f942 Merge pull request #1355 from F30/key-bindings 
Use terminfo key codes instead of hardcoded ones for key bindings
 2014-03-13 08:07:24 -07:00
Kaiwen Xu b71a2b9d0f Removed unsolicited aliases. 
Those aliases should be in user's .zshrc file, instead of being default.
 2014-03-10 04:05:14 -04:00
Robby Russell 48579ebf2b Merge pull request #2341 from mcornella/title_backticks 
Avoid evaluating special chars in $LINE on title command (fixes #2234)
 2014-03-08 14:30:55 -08:00
Robby Russell 9bd9278b80 Merge pull request #2287 from rumpelsepp/master 
Added/modified some useful aliases.
 2014-03-08 08:10:34 -08:00
Marc Cornellà a951600b4e Avoid 'title:parse error' with single quotes in $CMD 
Fixes #2182
 2014-02-21 22:16:12 +01:00
Marc Cornellà 3e5de21dc5 Revert previous commit, escape % 2014-02-21 22:16:12 +01:00
Marc Cornellà b73ced397f Use single quotes also in $LINE definiton 2014-02-21 22:16:12 +01:00
Marc Cornellà b0fbe0d11a Avoid evaluating special chars in $LINE on title command (fixes #2234) 2014-02-21 22:16:12 +01:00
Huang, Tao 217d8f0540 fc -l 1 instead of history in zsh_stats #2501 
$HIST_STAMP breaks zsh_stats. see #2501
 2014-02-06 17:29:33 +08:00
LFDM b0b79e0aba No need to eval in rvm_prompt_info! 
Just activate word-splitting.
 2014-01-07 19:08:20 +01:00
LFDM 85fde31991 Renames the file to prompt_info_functions.zsh 2014-01-06 09:58:40 +01:00
LFDM 082607c165 Adds documentation. 2014-01-06 09:57:23 +01:00
LFDM 72392a2c27 Adds all other dummy implementations. 2014-01-06 09:57:09 +01:00
LFDM 6a40557a8b Updates spectrum.zsh 2013-12-31 14:54:34 +01:00
LFDM c6aacf611d Refactors ruby_prompts.zsh 2013-12-31 02:45:09 +01:00
LFDM 8a887c5052 Joins ruby prompt files and adds ruby_prompt_info. 2013-12-31 02:11:02 +01:00
LFDM 7aa766168c Adds chruby_prompt_info dummy function. 2013-12-31 01:44:51 +01:00
LFDM ae6ded5ad7 Returns false when rbenv is not found. 2013-12-31 01:15:35 +01:00
LFDM 468b24a8d5 Returns false when rvm is not found. 2013-12-31 01:06:14 +01:00
LFDM bbbff94cca Fixes rvm_prompt_info() in lib/rvm.zsh 2013-12-31 00:35:57 +01:00
Michael Orr 9b811fb625 accidentally blew away a git config setting used for another purpose, renaming in order to distinguish 2013-12-06 17:31:35 -05:00
Bob Bonifield f082d7a245 Making auto-correction off by default 
- Allows for the user to turn on auto-correction using the
$ENABLE_CORRECTION variable
- Adds aliases regardless of variable assignment to aid users that use
setopt to turn correction back on in their zshrc
 2013-12-04 20:59:57 -07:00