1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-21 03:41:57 +00:00
Commit graph

3822 commits

Author SHA1 Message Date
Marc Cornellà
ebfba0e539 Drop the use of nohup on OSX for tmux compatibility
Apparently `nohup` is not needed in OSX, and using it has the side
that it may break under tmux with the error

  nohup: can't detach from console: No such file or directory

For now, this commit only drops the use of `nohup` in OSX. But it
*may* not be necessary under other similar platforms.
2015-11-27 15:40:31 +01:00
WeeBull
b57ddd6a67 Use actual commit --amend command for Mercurial
Rather than trying to emulate `git commit --amend` using mercurial queues (which might have side effects if you're using MQ for other things) use the `commit --amend` command which was introduced in Mercurial 2.2 (2012-05-01).
2015-11-26 14:08:53 +00:00
Markus Faerevaag
7d9648e631 [wd] update minor version (v0.4.2) 2015-11-23 22:22:45 +01:00
Marc Cornellà
22632aac7c 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à
249d2229d4 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
950bbccd60 gradle plugin: also list tasks in subprojects 2015-11-21 03:16:34 +01:00
Marc Cornellà
64e1252bd5 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à
5d8fd93cac Merge pull request #4617 from ahmadawais/patch-1
Removed Similar Aliases
2015-11-20 18:07:55 +01:00
Marc Cornellà
7627004a2f Merge pull request #4612 from stereodenis/patch-1
bundle outdated alias
2015-11-20 18:05:21 +01:00
Marc Cornellà
5289edcee5 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à
c120417336 Merge pull request #4619 from apjanke/mercurial-readme-tweak
Mercurial plugin: revise README
2015-11-20 16:40:47 +01:00
Andrew Janke
c8e280f2ab 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
Andrew Janke
8ea773582f vi-mode: remove line-init/finish widgets that broken terminfo keybindings
The zle-line-init and zle-line-finish definitions here were broken with
respect to smkx/rmkx because their "if" logic had fallthrough where it shouldn't,
so the mode was left in rmkx all the time. This just removes those widgets
entirely, because they're now defined (correctly) in lib/keybindings.zsh and
not needed in plugins.
2015-11-18 06:06:20 -05:00
Ahmad Awais
8f823c6371 Update README.md 2015-11-17 12:23:39 +05:00
Andrew Janke
cca422eacf 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
602cc62a5d Removed Similar Aliases
Two similar aliases which were causing issues.
2015-11-16 23:37:02 +05:00
Denis
bee79f0871 bundle outdated alias 2015-11-16 01:33:20 +03:00
Robby Russell
135c3763cc 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
9041a23d61 Merge pull request #4598 from syk0saje/patch-1
typo: able take -> able to take
2015-11-12 10:29:53 +00:00
Pepe Bawagan
06db64840c typo: able take -> able to take 2015-11-10 18:51:55 +08:00
Justin LeFebvre
76c423862f 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
Andrew Janke
cc116f65d6 agnoster: stronger warning about changing SEGMENT_SEPARATOR character 2015-11-06 19:44:26 -05:00
Andrew Janke
24492a2fdb Update github plugin to work with current hub versions
Removes old completion setup that breaks with current _git and _hub completions.
Ruby is no longer required by hub; removes that test.
Does not define new completions for hub; they are now defined by hub itself.
Change the functions to use hub to create the repos on GitHub.
Add error checking to the functions.
Removes apparently-unused _github completion definition.
2015-11-06 04:10:33 -05:00
Eduardo San Martin Morote
d3363964a2 Updated z version
Closes #3248
Closes #4570
2015-11-04 16:23:48 +01:00
LE Manh Cuong
c25002a13f Removing source command 2015-11-04 20:36:53 +07:00
Sebastian Gniazdowski
4c292ea2b0 Initial commit of Zsh Navigation Tools 2015-11-01 16:10:55 +01:00
Daniel Hahler
9e4aba4c8c archlinux: use $+commands instead of 'command -v' in a subshell 2015-11-01 00:21:26 +01:00
Danny Hawkins
8d388e464c use capit instead of shipit as shipit conflicts with npm package shipit 2015-10-30 08:11:38 +00:00
LE Manh Cuong
53a63355be Change coding style 2015-10-23 14:15:03 +07:00
LE Manh Cuong
45cd2df31f Update uninstall.sh
- Need dot `.` for POSIX compliant instead of `source`
 - Use modern syntax for command substitution
 - Fix missing double quotes
2015-10-23 09:03:24 +07:00
Alexander Golikov
67abf0f955 Update frontcube.zsh-theme
Fix «rvm» variable usage in RPROMPT out
2015-10-22 16:58:44 +05:00
Marc Cornellà
e44aa50301 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à
e9de366ea7 Update custom location command and fix code format 2015-10-21 17:39:13 +02:00
Marc Cornellà
ba20b9861e Merge pull request #4016 from coopermaruyama/master
Fix typo.

Close #4016
2015-10-21 17:09:26 +02:00
Cooper Maruyama
9264d75d5d 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à
405ee83af4 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à
d06f4d0893 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
a1755e652c Refactor for method in plugins/rake-fast/rake-fast.plugin.zsh 2015-10-21 23:36:36 +09:00
Marc Cornellà
4e42e1f7e1 Fix conditional in uninstall prompt 2015-10-21 11:28:12 +02:00
Marc Cornellà
b2010a0ae6 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à
ca5632bce1 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à
78dc858396 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à
8c84342b20 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
fe02e027fe Fix "be" -> "b" typo in coffee plugin README.md. 2015-10-20 23:43:11 +02:00
Marc Cornellà
fdb0e239d4 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à
b3c10b925e 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à
e0c9ada380 Merge pull request #4214 from queria/chuck-linefix
chucknorris: add missing line/quote delimiters
2015-10-20 23:05:12 +02:00
Marc Cornellà
662bdcc8d8 Merge pull request #4515 from brianloveswords/safer-install-script
Make install script safer
2015-10-20 22:47:02 +02:00
Brian J Brennan
c9d93757e8 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à
a7b4c09373 Merge pull request #4526 from sachin21/fix_typo
[FIX #4525]: Fix typo
2015-10-20 12:54:10 +02:00