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:6152ac30bede172ba0422a8610dc796948ae1546
Branches Tags
mirrors:master
mirrors:update/plugins/kube-ps1/9b41c091
mirrors:update/plugins/history-substring-search/14c8d2e0
...
compare: mirrors:ce28ac42c8e9933b1b3ca041bed0a3f1140eada2
Branches Tags
mirrors:master
mirrors:update/plugins/kube-ps1/9b41c091
mirrors:update/plugins/history-substring-search/14c8d2e0

3 Commits
6152ac30be ... ce28ac42c8

Author SHA1 Message Date
Larson Carter
ce28ac42c8
Modernize install and update banners (#9045) 2020-06-28 22:06:13 +02:00
Marc Cornellà
97cf0bf4bd update: change dash in function name for sh compat (fixes #9064) 2020-06-28 18:54:59 +02:00
alexagnelli
48b98b957e
update: only update on a valid affirmative input (#9062) 
Co-authored-by: Marc Cornellà <marc.cornella@live.com>
 2020-06-28 18:34:02 +02:00
3 changed files with 12 additions and 11 deletions
Show Stats Expand all files Collapse all files

12
tools/check_for_upgrade.sh
View File

@ -19,13 +19,13 @@ function current_epoch() {
echo $(( EPOCHSECONDS / 60 / 60 / 24 )) echo $(( EPOCHSECONDS / 60 / 60 / 24 ))
} }
function update_last-updated_file() { function update_last_updated_file() {
echo "LAST_EPOCH=$(current_epoch)" >! "${ZSH_CACHE_DIR}/.zsh-update" echo "LAST_EPOCH=$(current_epoch)" >! "${ZSH_CACHE_DIR}/.zsh-update"
} }
function update_ohmyzsh() { function update_ohmyzsh() {
ZSH="$ZSH" sh "$ZSH/tools/upgrade.sh" ZSH="$ZSH" sh "$ZSH/tools/upgrade.sh"
update_last-updated_file update_last_updated_file
} }
() { () {
@ -55,7 +55,7 @@ function update_ohmyzsh() {
# Create or update .zsh-update file if missing or malformed # Create or update .zsh-update file if missing or malformed
if ! source "${ZSH_CACHE_DIR}/.zsh-update" 2>/dev/null || [[ -z "$LAST_EPOCH" ]]; then if ! source "${ZSH_CACHE_DIR}/.zsh-update" 2>/dev/null || [[ -z "$LAST_EPOCH" ]]; then
update_last-updated_file update_last_updated_file
return return
fi fi
@ -79,10 +79,10 @@ function update_ohmyzsh() {
read -r -k 1 option read -r -k 1 option
[[ "$option" != $'\n' ]] && echo [[ "$option" != $'\n' ]] && echo
case "$option" in case "$option" in
[nN]) update_last-updated_file ;; [yY$'\n']) update_ohmyzsh ;;
*) update_ohmyzsh ;; [nN]) update_last_updated_file ;;
esac esac
fi fi
} }
unset -f current_epoch update_last-updated_file update_ohmyzsh unset -f current_epoch update_last_updated_file update_ohmyzsh

8
tools/install.sh
View File

@ -269,11 +269,11 @@ main() {
/____/ ....is now installed! /____/ ....is now installed!
Please look over the ~/.zshrc file to select plugins, themes, and options. Before your scream Oh My Zsh! please look over the ~/.zshrc file to select plugins, themes, and options.
p.s. Follow us on https://twitter.com/ohmyzsh • Follow us on Twitter: https://twitter.com/ohmyzsh
• Join our Discord server: https://discord.gg/ohmyzsh
p.p.s. Get stickers, shirts, and coffee mugs at 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"

3
tools/upgrade.sh
View File

@ -62,7 +62,8 @@ 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${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${RESET}\n" "Want to get involved in the community? Join our Discord: https://discord.gg/ohmyzsh"
printf "${BLUE}${BOLD}%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?'