mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2026-05-29 04:53:17 +02:00
Merge remote-tracking branch 'upstream/master'
* upstream/master: (237 commits) feat(z): update to version afaf2965 (#12136) feat(gitfast): update to version v2.0 (#12135) ci(project): use ohmyzsh's bot credentials ci(dependencies): fix some envs and add requirements feat(git): add `gcB` alias (#12116) feat(aws): add support for sso sessions login (#12090) feat(aws): add sso logout capabilities (#12113) fix(bgnotify): don't require accessibility perms in macos (#11433) fix(nvm): prevent duplicates in lazy_cmd feat(react-native): add aliases for iPhone 15 (#12114) fix(bgnotify): make it work with `set -e` (#12111) fix(changelog): use longer hashes for commits (#12096) fix(rake-fast): make `.rake_tasks` write atomic (#12108) ci(dependencies): fix typo ci(dependencies): add automation for updating external dependencies (#12109) feat(dotnet): update completion script (#12028) feat(frontend-search): add `I am lucky` option feat(frontend-search): add nextjs fix(lib): patch `omz_urlencode` to not encode UTF-8 chars in Termux (#12076) feat(bgnotify): add option to disable terminal bell (#12077) ... # Conflicts: # README.md
This commit is contained in:
commit
c876a57173
181 changed files with 3830 additions and 1615 deletions
|
|
@ -63,7 +63,9 @@ zdot="${ZDOTDIR:-$HOME}"
|
|||
# Default value for $ZSH
|
||||
# a) if $ZDOTDIR is supplied and not $HOME: $ZDOTDIR/ohmyzsh
|
||||
# b) otherwise, $HOME/.oh-my-zsh
|
||||
[ "$ZDOTDIR" = "$HOME" ] || ZSH="${ZSH:-${ZDOTDIR:+$ZDOTDIR/ohmyzsh}}"
|
||||
if [ -n "$ZDOTDIR" ] && [ "$ZDOTDIR" != "$HOME" ]; then
|
||||
ZSH="${ZSH:-$ZDOTDIR/ohmyzsh}"
|
||||
fi
|
||||
ZSH="${ZSH:-$HOME/.oh-my-zsh}"
|
||||
|
||||
# Default settings
|
||||
|
|
@ -84,6 +86,10 @@ command_exists() {
|
|||
user_can_sudo() {
|
||||
# Check if sudo is installed
|
||||
command_exists sudo || return 1
|
||||
# Termux can't run sudo, so we can detect it and exit the function early.
|
||||
case "$PREFIX" in
|
||||
*com.termux*) return 1 ;;
|
||||
esac
|
||||
# The following command has 3 parts:
|
||||
#
|
||||
# 1. Run `sudo` with `-v`. Does the following:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue