mirror of
https://github.com/robbyrussell/oh-my-zsh.git
synced 2026-10-02 16:03:47 +02:00
Compare commits
6
Commits
4b657407c9
...
a5ecff7560
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a5ecff7560 | ||
|
|
233ec5c507 | ||
|
|
91ad6c5c4c | ||
|
|
b5d75fc565 | ||
|
|
44ce832bbd | ||
|
|
b23f11ce1e |
No files matched your search
@@ -60,6 +60,6 @@ jobs:
|
|||||||
retention-days: 5
|
retention-days: 5
|
||||||
|
|
||||||
- name: "Upload to code-scanning"
|
- name: "Upload to code-scanning"
|
||||||
uses: github/codeql-action/upload-sarif@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
|
uses: github/codeql-action/upload-sarif@cdf488f595d80d6e07e03d4674febd5ab45fa938 # v4.37.9
|
||||||
with:
|
with:
|
||||||
sarif_file: results.sarif
|
sarif_file: results.sarif
|
||||||
+1
-1
@@ -519,7 +519,7 @@ function _omz::plugin::load {
|
|||||||
# Check if it has completion to reload compinit
|
# Check if it has completion to reload compinit
|
||||||
local -a comp_files
|
local -a comp_files
|
||||||
comp_files=($base/_*(N))
|
comp_files=($base/_*(N))
|
||||||
has_completion=$(( $#comp_files > 0 ))
|
(( has_completion )) || has_completion=$(( $#comp_files > 0 ))
|
||||||
|
|
||||||
# Load the plugin
|
# Load the plugin
|
||||||
if [[ -f "$base/$plugin.plugin.zsh" ]]; then
|
if [[ -f "$base/$plugin.plugin.zsh" ]]; then
|
||||||
|
|||||||
+1
-1
@@ -271,7 +271,7 @@ function _omz_diag_dump_check_core_commands() {
|
|||||||
unfunction unhash unlimit unset unsetopt vared wait whence where which zcompile
|
unfunction unhash unlimit unset unsetopt vared wait whence where which zcompile
|
||||||
zle zmodload zparseopts zregexparse zstyle )
|
zle zmodload zparseopts zregexparse zstyle )
|
||||||
if is-at-least 5.1; then
|
if is-at-least 5.1; then
|
||||||
reserved_word+=( declare export integer float local readonly typeset )
|
reserved_words+=( declare export integer float local readonly typeset )
|
||||||
else
|
else
|
||||||
builtins+=( declare export integer float local readonly typeset )
|
builtins+=( declare export integer float local readonly typeset )
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -137,8 +137,9 @@ function gbda() {
|
|||||||
# Copied and modified from James Roeder (jmaroeder) under MIT License
|
# Copied and modified from James Roeder (jmaroeder) under MIT License
|
||||||
# https://github.com/jmaroeder/plugin-git/blob/216723ef4f9e8dde399661c39c80bdf73f4076c4/functions/gbda.fish
|
# https://github.com/jmaroeder/plugin-git/blob/216723ef4f9e8dde399661c39c80bdf73f4076c4/functions/gbda.fish
|
||||||
function gbds() {
|
function gbds() {
|
||||||
local default_branch=$(git_main_branch)
|
local default_branch
|
||||||
(( ! $? )) || default_branch=$(git_develop_branch)
|
default_branch=$(git_main_branch) \
|
||||||
|
|| default_branch=$(git_develop_branch)
|
||||||
|
|
||||||
git for-each-ref refs/heads/ "--format=%(refname:short)" | \
|
git for-each-ref refs/heads/ "--format=%(refname:short)" | \
|
||||||
while read branch; do
|
while read branch; do
|
||||||
|
|||||||
@@ -138,7 +138,7 @@ function consume100() {
|
|||||||
|
|
||||||
# Website traffic statistics (G)
|
# Website traffic statistics (G)
|
||||||
function webtraffic() {
|
function webtraffic() {
|
||||||
awk "{sum+=$10} END {print sum/1024/1024/1024}" "$(retlog)"
|
awk '{sum+=$10} END {print sum/1024/1024/1024}' "$(retlog)"
|
||||||
}
|
}
|
||||||
|
|
||||||
# Statistical connections 404
|
# Statistical connections 404
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ zstyle -s ':omz:update' mode update_mode || {
|
|||||||
if [[ "$update_mode" = disabled ]] \
|
if [[ "$update_mode" = disabled ]] \
|
||||||
|| [[ ! -w "$ZSH" || ! -O "$ZSH" ]] \
|
|| [[ ! -w "$ZSH" || ! -O "$ZSH" ]] \
|
||||||
|| [[ ! -t 1 && ${POWERLEVEL9K_INSTANT_PROMPT:-off} == off ]] \
|
|| [[ ! -t 1 && ${POWERLEVEL9K_INSTANT_PROMPT:-off} == off ]] \
|
||||||
|| ! command git --version 2>&1 >/dev/null \
|
|| ! command git --version >/dev/null 2>&1 \
|
||||||
|| (builtin cd -q "$ZSH"; ! command git rev-parse --is-inside-work-tree &>/dev/null); then
|
|| (builtin cd -q "$ZSH"; ! command git rev-parse --is-inside-work-tree &>/dev/null); then
|
||||||
unset update_mode
|
unset update_mode
|
||||||
return
|
return
|
||||||
|
|||||||
Reference in new issue
Block a user