summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-10-21Fix syntax error in #4515 on certain shellsMarc Cornellà
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-21Revert "Make install script safer"Marc Cornellà
This reverts commit c9d93757e82785a0fd1e0d1222f5d61e01849703, which makes it fail with a syntax error: sh: 1: Syntax error: "(" unexpected
2015-10-20Merge pull request #4519 from evanandrewrose/masterMarc Cornellà
Fix "be" -> "b" typo in coffee plugin README.md.
2015-10-20Fix "be" -> "b" typo in coffee plugin README.md.evanandrewrose
2015-10-20Merge pull request #4507 from WhyEee/fix-no-tputMarc Cornellà
Fix install.sh/upgrade.sh for tput-less systems
2015-10-20Merge pull request #4505 from arvindch/checked-upgradeMarc Cornellà
Check for git before trying to upgrade OMZ
2015-10-20Merge pull request #4214 from queria/chuck-linefixMarc Cornellà
chucknorris: add missing line/quote delimiters
2015-10-20Merge pull request #4515 from brianloveswords/safer-install-scriptMarc Cornellà
Make install script safer
2015-10-20Make install script saferBrian J Brennan
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-20Merge pull request #4526 from sachin21/fix_typoMarc Cornellà
[FIX #4525]: Fix typo
2015-10-20[FIX #4525]: Fix typoSatoshi Ohmori
2015-10-20Merge pull request #4419 from apjanke/installer-termcap-hackMarc Cornellà
installer: ignore errors in color setup, for FreeBSD portability
2015-10-20Merge pull request #4508 from Superbil/masterMarc Cornellà
Fixd bug for pyenv plugin
2015-10-20Merge pull request #4473 from apjanke/5_1_1-bracketed-paste-hackMarc Cornellà
Disable bracketed-paste-magic in zsh 5.1.1, where it is buggy
2015-10-19Fixd bug for pyenv pluginSuperbil
Check pyenv-virtualenv can eval before use it. Signed-off-by: Superbil <superbil@gmail.com>
2015-10-16Fix install.sh/upgrade.sh for tput-less systemsYannick Eckey
@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-16Check for git before trying to upgrade, as per #4504Arvind Chembarpu
2015-10-15Merge pull request #4492 from arvindch/tweak-pyenv-pluginRobby Russell
Tweak pyenv plugin
2015-10-15Enable pyenv rehashArvind Chembarpu
2015-10-15Init pyenv virtualenvs tooArvind Chembarpu
2015-10-13Merge pull request #4459 from Scuilion/update-gradle-commandsRobby Russell
Gradle Plugin: Update Gradle Commands
2015-10-13Merge pull request #4475 from apjanke/diagdump-5.1-fixRobby Russell
diagnostics: fix for reserved-word changes in zsh 5.1
2015-10-13Merge pull request #4486 from gfvcastro/alias-rails-server-port-optionRobby Russell
Add option '--port' to 'rails server' alias.
2015-10-12Add option '--port' to 'rails server' alias.Gustavo Villa
2015-10-10Merge pull request #4482 from sachin21/add_an_alias_for_upstreamRobby Russell
Add an alias for upstream
2015-10-10Merge pull request #4480 from volcov/masterRobby Russell
add alias to sort by version
2015-10-09Merge pull request #4481 from apjanke/autoenv-emerg-fixRobby Russell
autoenv: actually source autoenv once located
2015-10-10Add an alias for upstreamSatoshi Ohmori
2015-10-09autoenv: actually source autoenv once locatedAndrew Janke
Fixes bug introduced in #4440
2015-10-09add alias to sort by versionBruno Volcov
2015-10-09Merge pull request #4204 from DoctorJellyface/patch-1Robby Russell
Added --now systemd aliases
2015-10-09Merge pull request #4440 from apjanke/autoenv-homebrewRobby Russell
autoenv: support homebrew-installed autoenv
2015-10-09Merge pull request #4464 from rchiossi/masterRobby Russell
Ask for confirmation before uninstall
2015-10-09Merge pull request #4254 from apjanke/copyfile-portabilityRobby Russell
Cross-platform clipboard clipcopy() and clippaste()
2015-10-09Merge pull request #4418 from Gnouc/masterRobby Russell
Encode64 Plugin - Fix wrong `echo` usage
2015-10-09Merge branch 'master' of github.com:robbyrussell/oh-my-zshRobby Russell
2015-10-09Renaming colored-man to colored-man-pages because it needs to be.Robby Russell
2015-10-09Merge pull request #4472 from theavish/masterRobby Russell
Fix ohmyz.sh link
2015-10-08diagnostics: fix for reserved-word changes in zsh 5.1Andrew Janke
Reference: https://github.com/zsh-users/zsh/blob/zsh-5.1.1/NEWS#L20-L32
2015-10-08Disable bracketed-paste-magic in zsh 5.1.1, where it is buggyAndrew Janke
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-08Fix ohmyz.sh linkAvi Samloff
Change http://ohmyz.sh link to use proper markdown syntax
2015-10-05Ask for confirmation before uninstallRodrigo Chiossi
Prompt the user before removing oh-my-zsh from the system
2015-10-05Merge branch 'master' of github.com:robbyrussell/oh-my-zshRobby Russell
2015-10-05Removing legacy rails-specific aliases from the Textmate plugin. This is ↵Robby Russell
probably best handled as a custom plugin.
2015-10-05Merge pull request #4444 from apjanke/git-extras-compatibilityRobby Russell
git-extras: fix for compatibility with zsh _git
2015-10-05clip*: add xsel supportAndrew Janke
2015-10-04Update Gradle CommandsKevin O'Neal
2015-10-04Merge pull request #4455 from swvjeff/masterRobby Russell
Fix 'ack-grep' bug for non-ubuntu users
2015-10-03Fix 'ack-grep' bug for non-ubuntu usersJeff Smith
Redirect STDERR along with STDOUT when looking for ack-grep
2015-10-03Merge pull request #4423 from gfvcastro/alias-rake-middlewareRobby Russell
Add 'rake middleware' alias.