mirrors/ohmyzsh-mirror
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-04-10 16:32:00 +00:00
Code Issues Releases Wiki Activity

Compare commits

base: mirrors:ce28ac42c8e9933b1b3ca041bed0a3f1140eada2
Branches Tags
mirrors:master
...
compare: mirrors:232cb19859ce9b0698ff8e281dc9e5d01b0aaf27
Branches Tags
mirrors:master

4 Commits
ce28ac42c8 ... 232cb19859

Author SHA1 Message Date
Alex Zdanowicz
232cb19859 install: fix typo (#9069) 
Changing 'your' to 'you'
 2020-07-01 15:44:14 +02:00
Konstantin Gribov
999d22bb0e gradle: force --console plain for tasks cache generation (#8731) 
Fixes #8730
 2020-07-01 15:20:41 +02:00
Patrick Moore
e606ac7051 Handle unset variables in various parts of the codebase (#8944) 
DISABLE_UNTRACKED_FILES_DIRTY, DISABLE_AUTO_TITLE, GIT_STATUS_IGNORE_SUBMODULES are not set
Handle these variables not being set with conditional access.

If the user has set -u option to report attempts to use undeclared / unassigned variable, accessing the variables needs to be conditional.
 2020-06-30 18:54:27 +02:00
Hélio
c4ac0d43ad encode64: fix typo in README (#9052) 2020-06-30 18:16:51 +02:00
5 changed files with 8 additions and 8 deletions
Expand all files Collapse all files

4
lib/git.zsh
View File

@@ -14,10 +14,10 @@ function parse_git_dirty() {
local -a FLAGS
FLAGS=('--porcelain')
if [[ "$(command git config --get oh-my-zsh.hide-dirty)" != "1" ]]; then
if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" == "true" ]]; then
if [[ "${DISABLE_UNTRACKED_FILES_DIRTY:-}" == "true" ]]; then
FLAGS+='--untracked-files=no'
fi
case "$GIT_STATUS_IGNORE_SUBMODULES" in
case "${GIT_STATUS_IGNORE_SUBMODULES:-}" in
git)
# let git decide (this respects per-repo config in .gitmodules)
;;

4
lib/termsupport.zsh
View File

@@ -50,13 +50,13 @@ fi
# Runs before showing the prompt
function omz_termsupport_precmd {
[[ "$DISABLE_AUTO_TITLE" == true ]] && return
[[ "${DISABLE_AUTO_TITLE:-}" == true ]] && return
title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE
}
# Runs before executing the command
function omz_termsupport_preexec {
[[ "$DISABLE_AUTO_TITLE" == true ]] && return
[[ "${DISABLE_AUTO_TITLE:-}" == true ]] && return
emulate -L zsh
setopt extended_glob

2
plugins/encode64/README.md
View File

@@ -53,6 +53,6 @@ plugins=(... encode64)
```console
$ echo "b2gtbXktenNoCg==" | decode64
oh-my-zsh
$ echo "b2gtbXktenNoCg==" | decode64
$ echo "b2gtbXktenNoCg==" | d64
oh-my-zsh
```

4
plugins/gradle/_gradle
View File

@@ -116,9 +116,9 @@ __gradle-generate-tasks-cache() {
# Reuse Gradle Daemon if IDLE but don't start a new one.
local gradle_tasks_output
if [[ ! -z "$($gradle_cmd --status 2>/dev/null | grep IDLE)" ]]; then
gradle_tasks_output="$($gradle_cmd --daemon --build-file $gradle_build_file -q tasks --all 2>/dev/null)"
gradle_tasks_output="$($gradle_cmd --daemon --build-file $gradle_build_file --console plain -q tasks --all 2>/dev/null)"
else
gradle_tasks_output="$($gradle_cmd --no-daemon --build-file $gradle_build_file -q tasks --all 2>/dev/null)"
gradle_tasks_output="$($gradle_cmd --no-daemon --build-file $gradle_build_file --console plain -q tasks --all 2>/dev/null)"
fi
local gradle_all_tasks="" root_tasks="" subproject_tasks="" output_line
local -a match

2
tools/install.sh
View File

@@ -269,7 +269,7 @@ main() {
/____/ ....is now installed!
Before your scream Oh My Zsh! please look over the ~/.zshrc file to select plugins, themes, and options.
Before you scream Oh My Zsh! please look over the ~/.zshrc file to select plugins, themes, and options.
• Follow us on Twitter: https://twitter.com/ohmyzsh
• Join our Discord server: https://discord.gg/ohmyzsh