Commit graph

3,700 commits

Author SHA1 Message Date
Markus Faerevaag
7a2816ab63 [wd] update minor version (v0.4.2) 2015-11-23 22:22:45 +01:00
Marc Cornellà
f3f23b0c69 Merge pull request #3859 from gnagy/master
gradle plugin: also list tasks in subprojects
Cleanup gradle plugin file
2015-11-21 03:24:53 +01:00
Marc Cornellà
07be3cf5ac Cleanup gradle plugin file
- Delete useless #!zsh
- Simplify gradle build file check
- Format comments and delete TODO stuff (already dealt with)
- Use `$()` syntax for cat commands
2015-11-21 03:16:34 +01:00
Gergely Nagy
5e03796aea gradle plugin: also list tasks in subprojects 2015-11-21 03:16:34 +01:00
Marc Cornellà
3b9cec8efb Merge pull request #4623 from apjanke/dircycle-remove-redundant-bindings
dircycle: remove redundant key bindings
2015-11-20 18:08:11 +01:00
Marc Cornellà
8d8c589309 Merge pull request #4617 from ahmadawais/patch-1
Removed Similar Aliases
2015-11-20 18:07:55 +01:00
Marc Cornellà
b2b4755eb8 Merge pull request #4612 from stereodenis/patch-1
bundle outdated alias
2015-11-20 18:05:21 +01:00
Marc Cornellà
67c6843ca7 Merge pull request #4592 from jstnlef/fix-weird-unstaged-behavior
Fixing strange git unstaged prompt behavior
2015-11-20 16:42:42 +01:00
Marc Cornellà
e228a2e45f Merge pull request #4619 from apjanke/mercurial-readme-tweak
Mercurial plugin: revise README
2015-11-20 16:40:47 +01:00
Andrew Janke
02295ef386 dircycle: remove redundant key bindings
In bindkey strings, "^[" and "\e" mean the same thing. They're both notations for Escape.
2015-11-18 07:02:22 -05:00
Ahmad Awais
33b4e2cd92 Update README.md 2015-11-17 12:23:39 +05:00
Andrew Janke
d748947a4f Mercurial plugin: revise README
Closes #4616
Changes the `plugins=(... mercurial ...)` to be closer to correct zsh syntax, removing commas and extra spaces.
Revises discussion on configuring themes to avoid sounding like users should modify the theme definition file in the main OMZ folder. Prioritizes the suggestion of using a theme which already supports hg_prompt_info.
2015-11-16 16:57:42 -05:00
Ahmad Awais
ffe80e0dde Removed Similar Aliases
Two similar aliases which were causing issues.
2015-11-16 23:37:02 +05:00
Denis
638d4495f1 bundle outdated alias 2015-11-16 01:33:20 +03:00
Robby Russell
d73ce93b6a Merge pull request #4563 from danhawkins/master
use capit instead of shipit as shipit conflicts with npm package shipit
2015-11-12 10:37:00 +00:00
Robby Russell
6542b200af Merge pull request #4598 from syk0saje/patch-1
typo: able take -> able to take
2015-11-12 10:29:53 +00:00
Pepe Bawagan
53ce7edcc6 typo: able take -> able to take 2015-11-10 18:51:55 +08:00
Justin LeFebvre
51cf730bf5 I noticed that for certain projects with unstaged changed I would get a 'U' character instead of the '●' character. This should fix that. 2015-11-07 20:05:30 -05:00
Danny Hawkins
7c40861978 use capit instead of shipit as shipit conflicts with npm package shipit 2015-10-30 08:11:38 +00:00
Marc Cornellà
bebcb0ef17 Merge pull request #4535 from robbyrussell/mcornella-patch-1
[README] Update custom directory command and fix code blocks
2015-10-21 17:45:44 +02:00
Marc Cornellà
229675bb2f Update custom location command and fix code format 2015-10-21 17:39:13 +02:00
Marc Cornellà
61b606a883 Merge pull request #4016 from coopermaruyama/master
Fix typo.

Close #4016
2015-10-21 17:09:26 +02:00
Cooper Maruyama
26a00de8b7 Fix typo.
* `cfp` alias was referencing an old version of the `cf` command which
no longer exists. This has been updated to reference a valid command.
2015-10-21 17:08:20 +02:00
Marc Cornellà
2f6df25701 Merge pull request #4500 from sachin21/modify_a_condition
[FIX ERROR] Refactor for function in plugins/rake-fast/rake-fast.plugin.zsh
2015-10-21 16:52:32 +02:00
Marc Cornellà
28148888bf Fix backwards logic in uninstaller once and for all
Really this time :P

Fixes #4533
2015-10-21 16:46:38 +02:00
Satoshi Ohmori
8d4d3e6bbd Refactor for method in plugins/rake-fast/rake-fast.plugin.zsh 2015-10-21 23:36:36 +09:00
Marc Cornellà
37e403708c Fix conditional in uninstall prompt 2015-10-21 11:28:12 +02:00
Marc Cornellà
519d043496 Fix syntax error in confirmation prompt of uninstall.sh
We need to use POSIX syntax. This file is no longer executed with zsh.

Fixes #4483.
2015-10-21 11:24:12 +02:00
Marc Cornellà
d1ced94cd6 Fix syntax error in #4515 on certain shells
Drops the `function` keyword and uses only `func(){}` syntax as per the
POSIX specification:

http://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_09_05

Related: #4531
2015-10-21 10:48:02 +02:00
Marc Cornellà
2e46bc14bc Revert "Make install script safer"
This reverts commit c9d93757e8, which
makes it fail with a syntax error:

  sh: 1: Syntax error: "(" unexpected
2015-10-21 10:36:40 +02:00
Marc Cornellà
94bcbe2a8f Merge pull request #4519 from evanandrewrose/master
Fix "be" -> "b" typo in coffee plugin README.md.
2015-10-20 23:43:33 +02:00
evanandrewrose
fe06ff6657 Fix "be" -> "b" typo in coffee plugin README.md. 2015-10-20 23:43:11 +02:00
Marc Cornellà
684093c441 Merge pull request #4507 from WhyEee/fix-no-tput
Fix install.sh/upgrade.sh for tput-less systems
2015-10-20 23:30:29 +02:00
Marc Cornellà
24e6b10b01 Merge pull request #4505 from arvindch/checked-upgrade
Check for git before trying to upgrade OMZ
2015-10-20 23:29:00 +02:00
Marc Cornellà
b6d6251acb Merge pull request #4214 from queria/chuck-linefix
chucknorris: add missing line/quote delimiters
2015-10-20 23:05:12 +02:00
Marc Cornellà
e426bccde6 Merge pull request #4515 from brianloveswords/safer-install-script
Make install script safer
2015-10-20 22:47:02 +02:00
Brian J Brennan
eb904994b9 Make install script safer
This changeset wraps all of the commands in tools/install.sh in a
function and then calls that function as the last line of the
script.

The current install instructions ask the user to download the install
script using `curl` and pass the result to `sh`. This is totally
fine (as long as both the instructions and the script itself are served
using HTTPS), but the script should be written in a way such that it
doesn't start trying to actually *do* anything until the very last line.

The reason is due to the way `curl` work: if the socket drops before the
request is complete (server abruptly hangs up, client's internet flakes
out, etc.), `curl` will return the partial data that it received. Here
is an example of that:

![partial file execution](https://cldup.com/qU_Mnh2GmT.png)

A way this might cause issues for tools/install.sh is if the connection drops
after cloning but before the repository (L53-56). The .zshrc
configuration will not be copied and the shell will not be changed, but
if the user tries to run the install script again it will claim
oh-my-zsh is already installed (L31-39).

While this is not a particularly dangerous error condition (the user can
just delete .oh-my-zsh and re-run), it can certainly be confusing for
new users. This also helps future-proof the script for a time when it
might need to use a "dangerous" command, e.g. `rm`, and we want to make
sure it happens in the most transactional way possible.
2015-10-20 14:18:22 -04:00
Marc Cornellà
5948117517 Merge pull request #4526 from sachin21/fix_typo
[FIX #4525]: Fix typo
2015-10-20 12:54:10 +02:00
Satoshi Ohmori
77f775e807 [FIX #4525]: Fix typo 2015-10-20 18:45:41 +09:00
Marc Cornellà
8418236f6a Merge pull request #4419 from apjanke/installer-termcap-hack
installer: ignore errors in color setup, for FreeBSD portability
2015-10-20 08:30:14 +02:00
Marc Cornellà
d4e4fa54a0 Merge pull request #4508 from Superbil/master
Fixd bug for pyenv plugin
2015-10-20 08:28:13 +02:00
Marc Cornellà
174bf19bd0 Merge pull request #4473 from apjanke/5_1_1-bracketed-paste-hack
Disable bracketed-paste-magic in zsh 5.1.1, where it is buggy
2015-10-20 08:26:15 +02:00
Superbil
bbdd304565 Fixd bug for pyenv plugin
Check pyenv-virtualenv can eval before use it.

Signed-off-by: Superbil <superbil@gmail.com>
2015-10-19 15:13:06 +08:00
Yannick Eckey
4a31b3cf24 Fix install.sh/upgrade.sh for tput-less systems
@fcrozat's original fix assumes `which` not to output anything to STDOUT
in case the command is not found. That is not necessarily true on all
systems. A better solution is to check the return value instead.

Fixes #4376
2015-10-16 22:27:46 +02:00
Arvind Chembarpu
ad9947a4af Check for git before trying to upgrade, as per #4504 2015-10-16 23:19:55 +05:30
Robby Russell
9a77f979ba Merge pull request #4492 from arvindch/tweak-pyenv-plugin
Tweak pyenv plugin
2015-10-15 11:33:16 -07:00
Arvind Chembarpu
9d84cc0f50 Enable pyenv rehash 2015-10-15 08:44:15 +05:30
Arvind Chembarpu
4ff7c35f36 Init pyenv virtualenvs too 2015-10-15 08:43:40 +05:30
Robby Russell
651d6ca4ea Merge pull request #4459 from Scuilion/update-gradle-commands
Gradle Plugin: Update Gradle Commands
2015-10-13 18:09:51 -07:00
Robby Russell
7e9ac4cc30 Merge pull request #4475 from apjanke/diagdump-5.1-fix
diagnostics: fix for reserved-word changes in zsh 5.1
2015-10-13 18:01:52 -07:00