Customization/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-18 18:31:59 +00:00
Code Releases Activity

style(init): use consistent code style in init script (#10601)

Browse source
This commit is contained in:
Carlo Sala 2022-01-28 23:28:19 +01:00 committed by GitHub
parent 46f5d38b1d
commit eabec36586
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
oh-my-zsh.sh
View file

@ -57,14 +57,14 @@ mkdir -p "$ZSH_CACHE_DIR/completions"
(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath) (( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
# Check for updates on initial load... # Check for updates on initial load...
if [ "$DISABLE_AUTO_UPDATE" != "true" ]; then if [[ "$DISABLE_AUTO_UPDATE" != true ]]; then
source $ZSH/tools/check_for_upgrade.sh source "$ZSH/tools/check_for_upgrade.sh"
fi fi
# Initializes Oh My Zsh # Initializes Oh My Zsh
# add a function path # add a function path
fpath=($ZSH/functions $ZSH/completions $fpath) fpath=("$ZSH/functions" "$ZSH/completions" $fpath)
# Load all stock functions (from $fpath files) called below. # Load all stock functions (from $fpath files) called below.
autoload -U compaudit compinit autoload -U compaudit compinit
@ -75,7 +75,6 @@ if [[ -z "$ZSH_CUSTOM" ]]; then
ZSH_CUSTOM="$ZSH/custom" ZSH_CUSTOM="$ZSH/custom"
fi fi
is_plugin() { is_plugin() {
local base_dir=$1 local base_dir=$1
local name=$2 local name=$2
@ -86,10 +85,10 @@ is_plugin() {
# Add all defined plugins to fpath. This must be done # Add all defined plugins to fpath. This must be done
# before running compinit. # before running compinit.
for plugin ($plugins); do for plugin ($plugins); do
if is_plugin $ZSH_CUSTOM $plugin; then if is_plugin "$ZSH_CUSTOM" "$plugin"; then
fpath=($ZSH_CUSTOM/plugins/$plugin $fpath) fpath=("$ZSH_CUSTOM/plugins/$plugin" $fpath)
elif is_plugin $ZSH $plugin; then elif is_plugin "$ZSH" "$plugin"; then
fpath=($ZSH/plugins/$plugin $fpath) fpath=("$ZSH/plugins/$plugin" $fpath)
else else
echo "[oh-my-zsh] plugin '$plugin' not found" echo "[oh-my-zsh] plugin '$plugin' not found"
fi fi
@ -98,14 +97,14 @@ done
# Figure out the SHORT hostname # Figure out the SHORT hostname
if [[ "$OSTYPE" = darwin* ]]; then if [[ "$OSTYPE" = darwin* ]]; then
# macOS's $HOST changes with dhcp, etc. Use ComputerName if possible. # macOS's $HOST changes with dhcp, etc. Use ComputerName if possible.
SHORT_HOST=$(scutil --get ComputerName 2>/dev/null) || SHORT_HOST=${HOST/.*/} SHORT_HOST=$(scutil --get ComputerName 2>/dev/null) || SHORT_HOST="${HOST/.*/}"
else else
SHORT_HOST=${HOST/.*/} SHORT_HOST="${HOST/.*/}"
fi fi
# Save the location of the current completion dump file. # Save the location of the current completion dump file.
if [ -z "$ZSH_COMPDUMP" ]; then if [[ -z "$ZSH_COMPDUMP" ]]; then
ZSH_COMPDUMP="${ZDOTDIR:-${HOME}}/.zcompdump-${SHORT_HOST}-${ZSH_VERSION}" ZSH_COMPDUMP="${ZDOTDIR:-$HOME}/.zcompdump-${SHORT_HOST}-${ZSH_VERSION}"
fi fi
# Construct zcompdump OMZ metadata # Construct zcompdump OMZ metadata
@ -119,15 +118,15 @@ if ! command grep -q -Fx "$zcompdump_revision" "$ZSH_COMPDUMP" 2>/dev/null \
zcompdump_refresh=1 zcompdump_refresh=1
fi fi
if [[ $ZSH_DISABLE_COMPFIX != true ]]; then if [[ "$ZSH_DISABLE_COMPFIX" != true ]]; then
source $ZSH/lib/compfix.zsh source "$ZSH/lib/compfix.zsh"
# If completion insecurities exist, warn the user # If completion insecurities exist, warn the user
handle_completion_insecurities handle_completion_insecurities
# Load only from secure directories # Load only from secure directories
compinit -i -C -d "${ZSH_COMPDUMP}" compinit -i -C -d "$ZSH_COMPDUMP"
else else
# If the user wants it, load from all found directories # If the user wants it, load from all found directories
compinit -u -C -d "${ZSH_COMPDUMP}" compinit -u -C -d "$ZSH_COMPDUMP"
fi fi
# Append zcompdump metadata if missing # Append zcompdump metadata if missing
@ -140,40 +139,48 @@ $zcompdump_revision
$zcompdump_fpath $zcompdump_fpath
EOF EOF
fi fi
unset zcompdump_revision zcompdump_fpath zcompdump_refresh unset zcompdump_revision zcompdump_fpath zcompdump_refresh
# Load all of the config files in ~/oh-my-zsh that end in .zsh # Load all of the config files in ~/oh-my-zsh that end in .zsh
# TIP: Add files you don't want in git to .gitignore # TIP: Add files you don't want in git to .gitignore
for config_file ($ZSH/lib/*.zsh); do for config_file ("$ZSH"/lib/*.zsh); do
custom_config_file="${ZSH_CUSTOM}/lib/${config_file:t}" custom_config_file="$ZSH_CUSTOM/lib/${config_file:t}"
[ -f "${custom_config_file}" ] && config_file=${custom_config_file} [[ -f "$custom_config_file" ]] && config_file="$custom_config_file"
source $config_file source "$config_file"
done done
unset custom_config_file
# Load all of the plugins that were defined in ~/.zshrc # Load all of the plugins that were defined in ~/.zshrc
for plugin ($plugins); do for plugin ($plugins); do
if [ -f $ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh ]; then if [[ -f "$ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh" ]]; then
source $ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh source "$ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh"
elif [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then elif [[ -f "$ZSH/plugins/$plugin/$plugin.plugin.zsh" ]]; then
source $ZSH/plugins/$plugin/$plugin.plugin.zsh source "$ZSH/plugins/$plugin/$plugin.plugin.zsh"
fi fi
done done
unset plugin
# Load all of your custom configurations from custom/ # Load all of your custom configurations from custom/
for config_file ($ZSH_CUSTOM/*.zsh(N)); do for config_file ("$ZSH_CUSTOM"/*.zsh(N)); do
source $config_file source "$config_file"
done done
unset config_file unset config_file
# Load the theme # Load the theme
if [ ! "$ZSH_THEME" = "" ]; then is_theme() {
if [ -f "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme" ]; then local base_dir=$1
local name=$2
builtin test -f $base_dir/$name.zsh-theme
}
if [[ -n "$ZSH_THEME" ]]; then
if is_theme "$ZSH_CUSTOM" "$ZSH_THEME"; then
source "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme" source "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme"
elif [ -f "$ZSH_CUSTOM/themes/$ZSH_THEME.zsh-theme" ]; then elif is_theme "$ZSH_CUSTOM/themes" "$ZSH_THEME"; then
source "$ZSH_CUSTOM/themes/$ZSH_THEME.zsh-theme" source "$ZSH_CUSTOM/themes/$ZSH_THEME.zsh-theme"
else elif is_theme "$ZSH/themes" "$ZSH_THEME"; then
source "$ZSH/themes/$ZSH_THEME.zsh-theme" source "$ZSH/themes/$ZSH_THEME.zsh-theme"
else
echo "[oh-my-zsh] theme '$ZSH_THEME' not found"
fi fi
fi fi