installer: fix, refactor and add installer arguments #5169
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Jun 16, 2016
mcornella
force-pushed
the
refactor-installer
branch
4 times, most recently
from
a15d621
to
cc44ad8
Compare
mcornella
force-pushed
the
refactor-installer
branch
from
cc44ad8
to
612c561
Compare
mcornella
force-pushed
the
refactor-installer
branch
5 times, most recently
from
c017808
to
d9f18a5
Compare
mcornella
added
Status: testers needed
mcornella
force-pushed
the
refactor-installer
branch
2 times, most recently
from
53fa153
to
5cf6022
Compare
This was referenced Aug 11, 2016
mcornella
force-pushed
the
refactor-installer
branch
from
5cf6022
to
0048e60
Compare
tools/install.sh
Outdated
| TEST_CURRENT_SHELL=$(expr "$SHELL" : '.*/\(.*\)') | ||
| if [ "$TEST_CURRENT_SHELL" != "zsh" ]; then | ||
| # If this platform provides a "chsh" command (not Cygwin), do it, man! | ||
| if command_exists chsh; then |
There was a problem hiding this comment.
This assumes that /etc/shells exists if chsh exists, which is not the case on all systems (Android).
Could we also check for /etc/shells here before running grep /zsh$ /etc/shells | tail -1, and fall back to I can't change your shell automatically otherwise?
mcornella
force-pushed
the
refactor-installer
branch
from
0048e60
to
9c1a94b
Compare
mcornella
force-pushed
the
refactor-installer
branch
7 times, most recently
from
171453e
to
886e110
Compare
This replaces the currently running process with the new one using `exec` instead of creating a new process. This way, when the user `exit`s out of the new shell it will not pop them back into the shell from which ohmyzsh was installed from.
Otherwise we risk a situation where a full path to `zsh` is commented, i.e.:
#/usr/local/bin/zsh
Guard clauses are if constructs that return early if there is an error that prevents continuing. This way there isn't a big nesting of if expressions.
Co-authored-by: Fredrik Fornwall <fredrik@fornwall.net>
This changes the behavior to default to the binary found first in $PATH, then checking it's actually in the shells file (/etc/shells). If that fails go back to the previous behavior, but actually check that the path obtained exists in the filesystem. Co-authored-by: Joel Kuzmarski <leoj3n@gmail.com>
This facilitates testing of changes to the core installation code: you'll be able to do a roundtrip test of install and uninstall using the working code on your branch. Controlled by passing $REPO and $BRANCH environment variables to install.sh.
Supposed to be POSIX-compatible. Proved to work in dash, yash and whatever alpine uses. See https://unix.stackexchange.com/a/371873
Co-authored-by: Marshall Ford <inbox@marshallford.me> Co-authored-by: Joel Kuzmarski <leoj3n@gmail.com>
Co-authored-by: Joel Kuzmarski <leoj3n@gmail.com>
Co-authored-by: Liquidsoul <liquidsoul@liquidsoul.fr> Co-authored-by: Alexander Polynomdivision <digitalmail555@googlemail.com> Co-authored-by: loket <loket@cruftlab.io> Co-authored-by: Connor Demille <subtlepseudonym@gmail.com>
Co-authored-by: Antonio QUINTAVALLE <antonio.quintavalle@amadeus.com> Co-authored-by: Marc Cornellà <marc.cornella@live.com>
tput may throw errors on invalid $TERM values, for example. This shorthand syntax allows for that as well as for if tput doesn't exist.
mcornella
force-pushed
the
refactor-installer
branch
from
69f9ede
to
c8ac403
Compare
installer: fix, refactor and add installer arguments
mcornella
removed
the
Status: testers needed
|
For what it's worth: |
stephen
added a commit
to stephen/dotfiles
that referenced
this pull request
Jun 17, 2021
This lets installation run all the way through without running twice. Let's try it. See ohmyzsh/ohmyzsh#5169
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ready for testing
This is an all-encompassing PR to fix once and for all all issues related to the OMZ installer, as well as adding features requested many times.
Fixes
zshrcfile mangling.zshrc.pre-oh-my-zshFixes #2499. Fixes #4390. Fixes #4391.
Change of default shell issues
/etc/shellsexistsFixes #4131. Fixes #4564. Fixes #4818. Fixes #5277. Fixes #6569. Fixes #7254.
Restore default shell
Fixes #3447. Fixes #6119. Fixes #6299. Fixes #6356. Fixes #6608.
$PATHmanagementPATH=with no$PATHinside #2586: install.sh:PATH=with no$PATHinsideFixes #1359. Fixes #2586. Fixes #4925. Closes #2589. Closes #4317.
New features
Skip change of default shell
Fixes #4261. Fixes #7100. Fixes #7266. Fixes #7721. Fixes #7865.
The installer respects the environment variable
CHSH. Set tono, it will skip the chsh step. It also reads the flag--skip-chshwhich has the same effect. For instance, these two are equivalent:Don't run zsh after install
Fixes #4393. Fixes #5002. Fixes #5853. Fixes #5893. Fixes #6547. Fixes #7790.
As in the skip-chsh feature above, the installer respects the variable
RUNZSH, which when set tonowill skip the zsh call when the install is done. The flag--unattendedalso setsRUNZSH=no, as well as settingCHSH=no. So these two are equivalent:Forks
Fixes #3648. Fixes #5628. Fixes #7496.
The installer respects the following environment variables, that can be set up when calling it with
VAR=value sh install.sh.REPO: value in the form ofowner/project. Useful for forks in GitHub (defaults to `robbyrussell/oh-my-zsh).BRANCH: default branch to check out once the clone has finished (defaults to master).REMOTE: full remote URL (supersedesREPOif set). You could for example choose an ssh remote URL, likegit@github.com:user/oh-my-zsh, or another fork from GitLab or Bitbucket.Other
Fixes #5320. Fixes #7007.
Closes #5194.