Commit graph

78 commits

Author SHA1 Message Date
Fredrik Fornwall dac2a6e27a Replace /usr/bin/env with env
Some environments (such as Android) does not have /usr/bin.
2014-08-20 23:52:05 +02:00
n.st a9e1d9aa89 Cancel upgrade if $ZSH is not writable
from #2360
2014-06-04 19:37:14 +02:00
Mark Feltner 8d976e02b1 fix(tools/check_for_upgrade): Don't source profile
Reverts #2296, but mostly #1883.

There is no need to source ~/.profile when this script is read. oh-my-zsh writes no configuration data in ~/.profile.

If the user wishes to use data within ~/.profile, then they should source it in another place.

Fixes #2315
2014-05-24 19:51:08 +02:00
Adam Luikart 9590b96b3f Write the update file even if CLOBBER is unset. 2014-05-24 19:40:30 +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
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
Robby Russell a38af27991 Revert "Cancel update if the current user doesn't have write permissions for the oh-my-zsh directory."
This reverts commit 152e1e07e0.
2013-12-18 17:03:33 -08:00
n.st 152e1e07e0 Cancel update if the current user doesn't have write permissions for the oh-my-zsh directory. 2013-12-18 18:27:20 +01:00
Patrick Stadler 858c515df2 source ~/.profile only if it exists 2013-12-03 09:52:51 +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
Robby Russell f48d6759e6 Merge pull request #1883 from Stibbons/gsemet_push_source_profile_for_upgrade
source ~/.profile for upgrading (to source the proxy configuration)
2013-12-02 23:43:43 -08:00
Robby Russell f574849c0a Merge pull request #1927 from dongweiming/modify
Modify determine the oh-my-zsh installed in non-default path of the installed
2013-12-02 23:37:49 -08:00
Valentin Shevko 7c56364dc4 Add update statistics
After the upgrade is interesting to know what's new.
2013-11-22 02:34:33 +03: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
Gaetan Semet 0fcb7dd55e Display right prompt in theme chooser
I didn't found the way to right-align the right prompt
properly.

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-09-10 11:28:31 +02: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
UncleBill 87a1d8a02d git-pull add --rebase option 2013-06-25 12:08:02 +08:00
Gaetan Semet 3f44f51e9c source ~/.profile for upgrading (to source the proxy configuration)
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-11 14:51:26 +02:00
Marcus Müller 39b46f526c eliminated unnecessary cd and failing substitution
Changing the working directory in a sub-subshell
does not change the working directory of the executing
shell.

The substitution was broken for me on _all_ my machines,
so I started looking into the business.
2013-04-29 09:51:21 +02:00
Robby Russell d8e700c1b6 Merge pull request #1651 from deepusudhakar/master
Escape $ZSH path in upgrade_oh_my_zsh
2013-04-12 05:56:50 -07:00
Robby Russell f2a927f9b2 Merge pull request #1696 from henryyan/master
Added $PATH to PATH in install shell
2013-04-12 05:56:24 -07:00
Gaurav Misra 32a42f27b6 Escape spaces in folder name so script won't fail
If the current directory has spaces, the script fails to change paths and fails.
2013-04-09 11:45:16 -07:00
Henry Yan d55262b6a1 Added $PATH to PATH in install shell 2013-04-07 20:59:01 +08:00
Deepu Sudhakar 9991401aaa Escape /Users/desudhak/.oh-my-zsh path (previously broke spaces in path) 2013-03-10 14:36:39 -05:00
Probably Not dfbafe6d58 Fixing conflict in install scripts 2012-12-02 13:08:06 -08:00
Robby Russell 9a88e76823 Merge pull request #1370 from ericmathison/syntax-fix
Fix color syntax
2012-12-01 11:58:21 -08:00
Eric Danielson 200a25818a Add UPDATE_ZSH_DAYS setting 2012-11-26 11:35:16 -08:00
Sergey Lukin ebeae4abe9 Fix /bin/sh compatibility issue in install.sh 2012-11-09 23:53:22 +02:00
Eric Mathison b0cf0674ef Fix color syntax 2012-10-21 02:19:56 -07:00
Robby Russell 1c23a52f57 auto-upadate feature will now reset the epoch so that if a user doesn't say yes, it won't ask them again for a while. fixes #1240 2012-07-20 15:07:51 -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
Robby Russell 7d9ae4cdb1 Merge pull request #1055 from daniellockard/patch-1
Added an if-statement to see if git is installed
2012-06-13 13:17:24 -07:00
Robby Russell 91b4758d8f Now with 50% less auto-updates. 2012-05-31 09:52:53 -07:00
Daniel Lockard 12e181c6f6 Added an if-statement to see if git is installed 2012-04-04 13:04:00 -05:00
backspace 0d99759cc3 Don’t report that Oh My Zsh has been updated when it hasn’t. 2012-01-15 08:49:52 +02:00
Robby Russell 82568cc7e6 Merge pull request #708 from eatnumber1/update-print
Use printf rather than echo -e in update.sh
2011-12-16 11:04:34 -08:00
Russell Harmon 7ec2dd984a Use printf rather than echo -e in update.sh
update.sh is an "sh" script, not a zsh or bash script. On platforms
which have real sh, echo does not have the -e option.
2011-11-16 04:32:05 -05:00
Graham McMillan 4173ba1e95 Added option to disable the update prompt. Set DISABLE_UPDATE_PROMPT to true to enable. 2011-11-15 13:46:14 -05:00
Robby Russell 0fe2462af8 Merge pull request #554 from toolbear/549-fix-auto-upgrade
Fix auto upgrade failure from non-exported ZSH env var
2011-10-10 05:40:38 -07:00
Robby Russell 84c20ce6dd Merge pull request #482 from volpino/master
Theme chooser + fox's theme
2011-10-10 05:17:21 -07:00
Robby Russell 1ab0054dc6 Merge pull request #275 from tristan0x/require_tool
New script $ZSH/tools/require_tool.sh to ensure version of tool
2011-10-10 05:08:38 -07:00
Tim Taylor c113e88c45 Fix auto upgrade failure from non-exported ZSH env var
Fixes #549. Specify ZSH=$ZSH explicitly when invoking
the auto update scripts.
2011-08-17 00:36:27 -04:00
fox cbf662744f fixed theme chooser + options + list available themes + show all themes 2011-08-03 09:42:16 +02:00
Ilya Chesnokov b160ee6512 'echo' did not show colors without -e in upgrade.sh 2011-08-01 10:58:05 +04:00
fox d15d3a5b01 global zsh config 2011-07-24 20:51:27 +02:00
fox 76dd2d8b05 mac os fix 2011-07-24 11:58:41 +02:00