Commit Graph

58 Commits

Author SHA1 Message Date
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à
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
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
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
Andrew Janke
f94fee5a7f installer: don't bail on errors in color setup
This is a hack to keep the installer working on systems without tput/terminfo.
2015-09-28 08:35:25 -04:00
Robby Russell
935948cf3b Merge pull request #3646 from apjanke/installer-cygwin-support-3
Add Cygwin support to installer.
2015-09-26 09:35:39 -07:00
Andrew Janke
96ff86142e Merge branch 'master' into installer-cygwin-support-3
Conflicts:
	tools/install.sh
2015-09-23 18:53:05 -04:00
Frederic Crozat
884a879562 Do not fail if tput is not available
Fixes issue #4376
2015-09-21 20:02:57 +02:00
Andrew Janke
6cddf7202b Merge branch 'master' into installer-portable-colors 2015-09-19 15:07:36 -04:00
Robby Russell
56cdec7534 Merge pull request #3889 from leycec/compaudit
Repair `zsh` Path Permissions on `oh-my-zsh` Startup under Cygwin
2015-09-19 08:40:34 -07:00
Andrew Janke
82c76f6b5c Merge changes from #4241 into installer-portable-colors
Conflicts:
	tools/install.sh
	tools/upgrade.sh
2015-09-03 12:50:55 -04:00
Andrew Janke
502f08b5e1 Add Cygwin support to installer.
* Balk at incompatible Windows/MSYS git
* Test for chsh presence before trying to use it
* Replace non-portable `[[ ... ]]` and `[ x = *pattern* ]` constructs
2015-09-03 12:47:02 -04:00
Robby Russell
ccaaa992c7 Merge pull request #4241 from heartinpiece/master
Check if Zsh is installed prior to installing Oh My Zsh
2015-08-30 21:44:38 -07:00
Robby Russell
b3f167d998 Merge pull request #3613 from apjanke/remove-sed-i
Installer: Remove "sed -i" for portability and hygiene
2015-08-30 09:13:04 -07:00
Andrew Janke
fe92ea98e0 installer: switch twitter link to https 2015-08-27 17:17:43 -04:00
Chang Hyun Park
58d2f9335d Check if Zsh is installed prior to installing Oh My Zsh
Check if Zsh is installed before installing anything else.
New-commers, or people who don't read the disclaimers(ex. me) will go
straight to stack overflow if chsh -s returns an error.
2015-08-12 16:47:37 +09:00
leycec
e8caf22beb Cygwin-specific "chsh" installation issue fixed.
Installation previously assumed the existence of a "chsh" command in the current
${PATH}. Since Cygwin does *NOT* provide this command, installation now tests
for the existence of this command before attempting to run it.
2015-07-20 00:56:19 -04:00
leycec
da395c5837 Secure umask enforced during installation.
For safety, a umask of 022 prohibiting both group and other writability is now
enforced during OMZ installation. In theory, this should reduce the likelihood
of subsequent compinit() failures due to insecure directory permissions under
all platforms except for default Cygwin installations (in which Windows ACLs
override POSIX umasks).
2015-07-20 00:56:19 -04:00
Andrew Janke
8cf610089d installer: use terminfo for portable escape sequences
Do not use terminal visual effects if not connected to a terminal.
2015-07-06 20:18:32 -04:00
Andrew Janke
19ea867a3a install.sh: use portable printf instead of echo 2015-07-06 19:44:59 -04:00
Pablo Tamarit
03b8c199e5 Fix 'chsh' by checking '/etc/shells' instead of using 'which'
fix test for chsh in install
in case $SHELL is zsh but not the last one in /etc/shells
fixes #3026 fixes #3779 fixes #3780
2015-05-05 19:49:19 +02:00
Andrew Janke
1246c3e08b install.sh: Replace nonstandard "sed -i" with sed + mv commands. Makes portable to systems whose sed lacks "-i", like OpenBSD. 2015-02-20 02:34:54 -05:00
Robby Russell
d2667bd0a2 Merge pull request #3353 from mizabrik/master
Save ZSH path in newly created .zshrc
2015-02-10 11:21:15 -08:00
Nicholas T.
5cb0ed98d1 Fast installation time by shallow copying git repo
Use `--depth=1` to clone just the lastest version rather than every version in git.
2015-01-15 09:09:41 +10:00
mizabrik
c6a8b2ea6d Save ZSH path in newly created .zshrc 2014-11-28 19:40:56 +03:00
Robby Russell
c1cd9cb126 Merge pull request #3049 from strycore/master
Prevent chsh from running when $SHELL is already zsh
2014-08-31 11:42:40 -07:00
Robby Russell
671bd0cf4f Link to swag in installer... shameless profiting 2014-08-31 11:32:07 -07:00
Mathieu Comandon
91ba6d9887 Don't try running chsh if user already runs zsh 2014-08-21 12:47:48 +02:00
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
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
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
Henry Yan
d55262b6a1 Added $PATH to PATH in install shell 2013-04-07 20:59:01 +08: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
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