linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-19 21:41:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
3691 commits 1 branch 0 tags 138 MiB
Commit graph

3691 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Danny Hawkins
8d388e464c use capit instead of shipit as shipit conflicts with npm package shipit 2015-10-30 08:11:38 +00: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
Satoshi Ohmori
2c8697b934 [FIX #4525]: Fix typo 2015-10-20 18:45:41 +09:00
Marc Cornellà
8c73eb4f44 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à
45f0a2800b Merge pull request #4508 from Superbil/master 
Fixd bug for pyenv plugin
 2015-10-20 08:28:13 +02:00
Marc Cornellà
56345c26fb 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
2c54428d6e
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
75e619b724 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
e59e1c8417 Check for git before trying to upgrade, as per #4504 2015-10-16 23:19:55 +05:30
Robby Russell
aa15ebad3e Merge pull request #4492 from arvindch/tweak-pyenv-plugin 
Tweak pyenv plugin
 2015-10-15 11:33:16 -07:00
Arvind Chembarpu
8a362b2b1f Enable pyenv rehash 2015-10-15 08:44:15 +05:30
Arvind Chembarpu
8a95cedc3b Init pyenv virtualenvs too 2015-10-15 08:43:40 +05:30
Robby Russell
306e3e7ea0 Merge pull request #4459 from Scuilion/update-gradle-commands 
Gradle Plugin: Update Gradle Commands
 2015-10-13 18:09:51 -07:00
Robby Russell
b28db6b475 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
Robby Russell
30d7a6658e Merge pull request #4486 from gfvcastro/alias-rails-server-port-option 
Add option '--port' to 'rails server' alias.
 2015-10-13 17:55:24 -07:00
Gustavo Villa
b18d386d7f Add option '--port' to 'rails server' alias. 2015-10-12 04:32:22 -03:00
Robby Russell
57c2ac1e60 Merge pull request #4482 from sachin21/add_an_alias_for_upstream 
Add an alias for upstream
 2015-10-10 07:12:21 -07:00
Robby Russell
ff1bd952a7 Merge pull request #4480 from volcov/master 
add alias to sort by version
 2015-10-10 07:11:39 -07:00
Robby Russell
101758f63d Merge pull request #4481 from apjanke/autoenv-emerg-fix 
autoenv: actually source autoenv once located
 2015-10-09 22:53:10 -07:00
Satoshi Ohmori
7597bf805e Add an alias for upstream 2015-10-10 11:51:33 +09:00
Andrew Janke
2d0e7fbdad autoenv: actually source autoenv once located 
Fixes bug introduced in #4440
 2015-10-09 20:35:19 -04:00
Bruno Volcov
252078dd6c add alias to sort by version 2015-10-09 18:47:48 -03:00
Robby Russell
2522ab4504 Merge pull request #4204 from DoctorJellyface/patch-1 
Added --now systemd aliases
 2015-10-09 07:19:54 -07:00