mirrors/ohmyzsh-mirror
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-01-24 01:37:27 +08:00
Code Issues Releases Wiki Activity

Compare commits

base: mirrors:7deda85f8cf7fb3c2f36b771a2e8bd70a28bf0b3
Branches Tags
mirrors:master
mirrors:update/plugins/kube-ps1/9b41c091
mirrors:update/plugins/history-substring-search/14c8d2e0
..
compare: mirrors:079e7bb5e0a79171f3356d55d3f6302a82645a39
Branches Tags
mirrors:master
mirrors:update/plugins/kube-ps1/9b41c091
mirrors:update/plugins/history-substring-search/14c8d2e0

No commits in common. "7deda85f8cf7fb3c2f36b771a2e8bd70a28bf0b3" and "079e7bb5e0a79171f3356d55d3f6302a82645a39" have entirely different histories.
7deda85f8c ... 079e7bb5e0

4 changed files with 8 additions and 32 deletions
Show Stats Expand all files Collapse all files

4
lib/cli.zsh
View File

@ -201,14 +201,10 @@ function _omz::pr::test {
} }
function _omz::update { function _omz::update {
# Run update script
env ZSH="$ZSH" sh "$ZSH/tools/upgrade.sh" env ZSH="$ZSH" sh "$ZSH/tools/upgrade.sh"
# Update last updated file # Update last updated file
zmodload zsh/datetime zmodload zsh/datetime
echo "LAST_EPOCH=$(( EPOCHSECONDS / 60 / 60 / 24 ))" >! "${ZSH_CACHE_DIR}/.zsh-update" echo "LAST_EPOCH=$(( EPOCHSECONDS / 60 / 60 / 24 ))" >! "${ZSH_CACHE_DIR}/.zsh-update"
# Remove update lock if it exists # Remove update lock if it exists
command rm -rf "$ZSH/log/update.lock" command rm -rf "$ZSH/log/update.lock"
# Restart the zsh session
_omz::log info "restarting the zsh session..."
[[ -z "$SHELL" ]] && exec ${SHELL#-} || exec zsh
} }

14
lib/functions.zsh
View File

@ -7,20 +7,8 @@ function uninstall_oh_my_zsh() {
} }
function upgrade_oh_my_zsh() { function upgrade_oh_my_zsh() {
if (( $+functions[_omz::update] )); then
echo >&2 "${fg[yellow]}Note: \`$0\` is deprecated. Use \`omz update\` instead.$reset_color" echo >&2 "${fg[yellow]}Note: \`$0\` is deprecated. Use \`omz update\` instead.$reset_color"
fi omz update
# Run update script
env ZSH="$ZSH" sh "$ZSH/tools/upgrade.sh"
# Update last updated file
zmodload zsh/datetime
echo "LAST_EPOCH=$(( EPOCHSECONDS / 60 / 60 / 24 ))" >! "${ZSH_CACHE_DIR}/.zsh-update"
# Remove update lock if it exists
command rm -rf "$ZSH/log/update.lock"
# Restart the zsh session
_omz::log info "restarting the zsh session..."
[[ -z "$SHELL" ]] && exec ${SHELL#-} || exec zsh
} }
function take() { function take() {

12
tools/install.sh
View File

@ -53,10 +53,6 @@ error() {
echo ${RED}"Error: $@"${RESET} >&2 echo ${RED}"Error: $@"${RESET} >&2
} }
underline() {
echo "$(printf '\033[4m')$@$(printf '\033[24m')"
}
setup_color() { setup_color() {
# Only use colors if connected to a terminal # Only use colors if connected to a terminal
if [ -t 1 ]; then if [ -t 1 ]; then
@ -273,13 +269,11 @@ main() {
/____/ ....is now installed! /____/ ....is now installed!
EOF
cat <<-EOF
Before you 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: $(underline https://twitter.com/ohmyzsh) • Follow us on Twitter: https://twitter.com/ohmyzsh
• Join our Discord server: $(underline https://discord.gg/ohmyzsh) • Join our Discord server: https://discord.gg/ohmyzsh
• Get stickers, shirts, coffee mugs and other swag: $(underline https://shop.planetargon.com/collections/oh-my-zsh) • Get stickers, shirts, coffee mugs and other swag: https://shop.planetargon.com/collections/oh-my-zsh
EOF EOF
printf "$RESET" printf "$RESET"

8
tools/upgrade.sh
View File

@ -14,7 +14,6 @@ if [ -t 1 ]; then
YELLOW=$(printf '\033[33m') YELLOW=$(printf '\033[33m')
BLUE=$(printf '\033[34m') BLUE=$(printf '\033[34m')
BOLD=$(printf '\033[1m') BOLD=$(printf '\033[1m')
UNDER=$(printf '\033[4m')
RESET=$(printf '\033[m') RESET=$(printf '\033[m')
else else
RB_RED="" RB_RED=""
@ -29,7 +28,6 @@ else
GREEN="" GREEN=""
YELLOW="" YELLOW=""
BLUE="" BLUE=""
UNDER=""
BOLD="" BOLD=""
RESET="" RESET=""
fi fi
@ -64,9 +62,9 @@ then
printf '%s\____/%s_/ /_/ %s /_/ /_/ /_/%s\__, / %s /___/%s____/%s_/ /_/ %s\n' $RB_RED $RB_ORANGE $RB_YELLOW $RB_GREEN $RB_BLUE $RB_INDIGO $RB_VIOLET $RB_RESET printf '%s\____/%s_/ /_/ %s /_/ /_/ /_/%s\__, / %s /___/%s____/%s_/ /_/ %s\n' $RB_RED $RB_ORANGE $RB_YELLOW $RB_GREEN $RB_BLUE $RB_INDIGO $RB_VIOLET $RB_RESET
printf '%s %s %s %s /____/ %s %s %s %s\n' $RB_RED $RB_ORANGE $RB_YELLOW $RB_GREEN $RB_BLUE $RB_INDIGO $RB_VIOLET $RB_RESET printf '%s %s %s %s /____/ %s %s %s %s\n' $RB_RED $RB_ORANGE $RB_YELLOW $RB_GREEN $RB_BLUE $RB_INDIGO $RB_VIOLET $RB_RESET
printf "${BLUE}%s\n" "Hooray! Oh My Zsh has been updated and/or is at the current version." printf "${BLUE}%s\n" "Hooray! Oh My Zsh has been updated and/or is at the current version."
printf "${BLUE}${BOLD}%s ${UNDER}%s${RESET}\n" "To keep up on the latest news and updates, follow us on Twitter:" "https://twitter.com/ohmyzsh" printf "${BLUE}${BOLD}%s${RESET}\n" "To keep up on the latest news and updates, follow us on Twitter: https://twitter.com/ohmyzsh"
printf "${BLUE}${BOLD}%s ${UNDER}%s${RESET}\n" "Want to get involved in the community? Join our Discord:" "https://discord.gg/ohmyzsh" printf "${BLUE}${BOLD}%s${RESET}\n" "Want to get involved in the community? Join our Discord: https://discord.gg/ohmyzsh"
printf "${BLUE}${BOLD}%s ${UNDER}%s${RESET}\n" "Get your Oh My Zsh swag at:" "https://shop.planetargon.com/collections/oh-my-zsh" printf "${BLUE}${BOLD}%s${RESET}\n" "Get your Oh My Zsh swag at: https://shop.planetargon.com/collections/oh-my-zsh"
else else
printf "${RED}%s${RESET}\n" 'There was an error updating. Try again later?' printf "${RED}%s${RESET}\n" 'There was an error updating. Try again later?'
fi fi