Commit graph

3,673 commits

Author SHA1 Message Date
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
Robby Russell
2f38f6e56b 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
8bf528d362 Add option '--port' to 'rails server' alias. 2015-10-12 04:32:22 -03:00
Robby Russell
5805fc9da8 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
daf1b81e6b Merge pull request #4480 from volcov/master
add alias to sort by version
2015-10-10 07:11:39 -07:00
Robby Russell
bdea571987 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
0603007895 Add an alias for upstream 2015-10-10 11:51:33 +09:00
Andrew Janke
b8f9d4ce56 autoenv: actually source autoenv once located
Fixes bug introduced in #4440
2015-10-09 20:35:19 -04:00
Bruno Volcov
302ac31478 add alias to sort by version 2015-10-09 18:47:48 -03:00
Robby Russell
ebb2bfd6b8 Merge pull request #4204 from DoctorJellyface/patch-1
Added --now systemd aliases
2015-10-09 07:19:54 -07:00
Robby Russell
f5ac635909 Merge pull request #4440 from apjanke/autoenv-homebrew
autoenv: support homebrew-installed autoenv
2015-10-09 07:18:02 -07:00
Robby Russell
931413fa05 Merge pull request #4464 from rchiossi/master
Ask for confirmation before uninstall
2015-10-09 07:17:00 -07:00
Robby Russell
1d1d9e3593 Merge pull request #4254 from apjanke/copyfile-portability
Cross-platform clipboard clipcopy() and clippaste()
2015-10-09 07:15:53 -07:00
Robby Russell
ad79ef760b Merge pull request #4418 from Gnouc/master
Encode64 Plugin - Fix wrong `echo` usage
2015-10-09 07:15:20 -07:00
Robby Russell
8c30dfd552 Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2015-10-09 07:08:05 -07:00
Robby Russell
48d8919fcc Renaming colored-man to colored-man-pages because it needs to be. 2015-10-09 07:07:57 -07:00
Robby Russell
53feb70dd3 Merge pull request #4472 from theavish/master
Fix ohmyz.sh link
2015-10-09 07:02:14 -07:00
Andrew Janke
ac0bb160c7 diagnostics: fix for reserved-word changes in zsh 5.1
Reference:
https://github.com/zsh-users/zsh/blob/zsh-5.1.1/NEWS#L20-L32
2015-10-08 22:31:39 -04:00
Andrew Janke
5d8873f174 Disable bracketed-paste-magic in zsh 5.1.1, where it is buggy
A bracketed-paste-magic bug breaks pasting of CJK and some other characters in zsh 5.1.1.
http://www.zsh.org/mla/workers/2015/msg02680.html
See #4434
2015-10-08 22:13:42 -04:00
Avi Samloff
43175d38a5 Fix ohmyz.sh link
Change http://ohmyz.sh link to use proper markdown syntax
2015-10-08 15:07:24 -07:00
Rodrigo Chiossi
ee76ef5b75 Ask for confirmation before uninstall
Prompt the user before removing oh-my-zsh from the system
2015-10-05 18:32:42 -03:00
Robby Russell
44e3939404 Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2015-10-05 13:46:26 -07:00
Robby Russell
a4e9356619 Removing legacy rails-specific aliases from the Textmate plugin. This is probably best handled as a custom plugin. 2015-10-05 13:46:20 -07:00
Robby Russell
469c34902a Merge pull request #4444 from apjanke/git-extras-compatibility
git-extras: fix for compatibility with zsh _git
2015-10-05 07:50:08 -07:00
Andrew Janke
3e9951d264 clip*: add xsel support 2015-10-05 05:13:11 -04:00
Kevin O'Neal
cfa8ddd32a Update Gradle Commands 2015-10-04 17:05:28 -05:00
Robby Russell
dba3e9de32 Merge pull request #4455 from swvjeff/master
Fix 'ack-grep' bug for non-ubuntu users
2015-10-04 10:00:37 -07:00
Jeff Smith
3ac135dff0 Fix 'ack-grep' bug for non-ubuntu users
Redirect STDERR along with STDOUT when looking for ack-grep
2015-10-03 18:39:41 -07:00