Commit graph

39 commits

Author SHA1 Message Date
Gaetan Semet
316c46767e Merge remote-tracking branch 'upstream/master'
Conflicts:
	tools/install.sh
2014-04-23 14:45:49 +02:00
Henrik Holm
f46d06dae1 Correct redirection of output from 'hash'
The intention of the redirection to /dev/null is to hide the output
'hash: no such command: git' since we rely on the exit status.

However, the output goes to stderr, so it's stderr that needs to be
redirected. For completeness, we redirect both stderr and stdout using
'2>&1'.

Example:

  [~]$ hash git > /dev/null
  [~]$ PATH=''
  [~]$ hash git > /dev/null
  hash: no such command: git
  [~]$ hash git > /dev/null 2>&1
  [~]$
2014-03-30 10:34:13 -04:00
Gaetan Semet
92ed38cb85 Merge remote-tracking branch 'cadusk/master'
Conflicts:
	lib/aliases.zsh
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	tools/install.sh
2014-03-24 11:56:16 +01:00
Carlos Cardoso
ad4e88bc23 Merged blessed. 2014-03-23 19:58:16 -03:00
Gaetan Semet
4888217c85 Merge remote-tracking branch 'upstream/master'
Conflicts:
	README.textile
	lib/aliases.zsh
	templates/zshrc.zsh-template
	tools/install.sh
2014-03-14 16:50:51 +01:00
Robby Russell
47b0d754ae Fixing a few quirks in the latest installer updates (quoting /Users/robbyrussell/.oh-my-zsh and such). Also mentioining our twitter account after install 2014-03-13 10:15:18 -07:00
Andrew Vit
da1fa3b06a Abort installer on errors 2014-03-08 13:17:16 -08:00
Andrew Vit
2e11e2ab5a Write install path into .zshrc 2014-03-08 13:16:46 -08:00
Andrew Vit
5bd590ceb3 Reference default install path from ZSH variable 2014-03-08 13:13:52 -08:00
Robby Russell
6a2e65f4c8 Merge pull request #1402 from sergeylukin/master
Fix install.sh compatibility with /bin/sh
2014-03-08 08:39:34 -08:00
Carlos Cardoso
0fb7e54b90 Merged upstream configuration. 2013-12-17 01:26:27 -02:00
Gaetan Semet
24f2838f0b Merge remote-tracking branch 'upstream/master'
Conflicts:
	README.textile
	lib/aliases.zsh
	plugins/repo/repo.plugin.zsh
	templates/zshrc.zsh-template
	themes/ys.zsh-theme
2013-12-03 09:41:48 +01:00
Robby Russell
0d352109e9 Merge pull request #1087 from avit/install-template
Add configuration placeholders to installer template
2013-12-02 23:49:00 -08:00
Andrew Vit
1e9f55f09d Add configuration placeholders to installer template
Although the zshrc template adds a PATH= string, this is overwritten by the installer script.
This allows it to be placed anywhere in the file instead of having to append at the end.
2013-10-25 14:50:27 -07:00
dongweiming
d4a9467f89 Modify determine the oh-my-zsh installed in non-default path of the installed 2013-06-30 18:08:48 +08:00
Gaetan Semet
781364a35a Merge remote-tracking branch 'upstream/master'
Conflicts:
	lib/theme-and-appearance.zsh
	plugins/tmux/tmux.plugin.zsh
2013-06-05 11:10:38 +02:00
Carlos Cardoso
ee3267f30d Merged official branch changes. 2013-06-03 22:12:29 -03:00
Henry Yan
d55262b6a1 Added $PATH to PATH in install shell 2013-04-07 20:59:01 +08:00
Gaetan Semet
853d99fa98 Fixed file name issues
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-03-27 10:13:03 +01:00
Carlos Cardoso
fb15c83086 Updated repository references. 2013-03-27 10:10:33 +01:00
Probably Not
dfbafe6d58 Fixing conflict in install scripts 2012-12-02 13:08:06 -08:00
Sergey Lukin
ebeae4abe9 Fix /bin/sh compatibility issue in install.sh 2012-11-09 23:53:22 +02:00
Carlos Cardoso
0a3db5bf2d Updated repository references. 2012-10-24 00:35:17 -02:00
Eric Mathison
b0cf0674ef Fix color syntax 2012-10-21 02:19:56 -07:00
Renan Cakirerk
a39c9ffe5b Fix finding git issue. http://stackoverflow.com/questions/592620/check-if-a-program-exists-from-a-bash-script 2012-06-23 14:58:04 +03:00
Daniel Lockard
12e181c6f6 Added an if-statement to see if git is installed 2012-04-04 13:04:00 -05:00
Andrew Hodges
0c41b1cdc3 Colorize Install & Upgrade Scripts
Make tools/install.sh and tools/upgrade.sh pretty.
2011-06-03 14:05:25 -04:00
Arthur Kalmenson
1354eb1248 Changed to use which. 2011-04-18 22:51:28 -04:00
Arthur Kalmenson
5f415c465a Change URL to https since most corporate environments block git port. 2011-04-18 07:50:14 -04:00
Arthur Kalmenson
1e2152fcf3 Make the chsh more reliable. 2011-04-18 07:48:35 -04:00
Robby Russell
aeabc3f616 Switching to /usr/bin/env zsh instead of /bin/zsh in the installer 2010-08-19 08:04:18 -07:00
Robby Russell
5a3bde78d8 Sprinkling some candy on this muffin. 2010-05-07 15:35:03 -07:00
Toon Claes
886d97f41e Removed useless else 2009-10-16 23:03:50 +02:00
Robby Russell
b67961d812 Updating install process to copy your current environments PATH and adding it to the bottom of ~/.zshrc. 2009-09-07 09:11:34 -07:00
Robby Russell
fcc1cde56c Updating installer to use the new template file. ~/.zshrc will now be outside of the repository 2009-09-01 07:50:45 -07:00
Robby Russell
13ca4fab1a Changing order of loading zsh at end of install 2009-08-30 18:51:41 -07:00
Robby Russell
684eae38af Attempting to load zsh properly after auto-install 2009-08-30 18:50:09 -07:00
Robby Russell
3ec52a1353 Checking if .zshrc is a file or a symlink. 2009-08-30 18:44:14 -07:00
Robby Russell
71769107db Adding an installer tool 2009-08-30 18:36:11 -07:00