From 613045e7e565a9069568e7f94574701c3d440489 Mon Sep 17 00:00:00 2001 From: Marc Cornellà Date: Mon, 17 Aug 2020 21:47:39 +0200 Subject: Underline links in install and update script --- tools/install.sh | 12 +++++++++--- tools/upgrade.sh | 8 +++++--- 2 files changed, 14 insertions(+), 6 deletions(-) (limited to 'tools') diff --git a/tools/install.sh b/tools/install.sh index 8a93708ca..0fc554786 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -53,6 +53,10 @@ error() { echo ${RED}"Error: $@"${RESET} >&2 } +underline() { + echo "$(printf '\033[4m')$@$(printf '\033[24m')" +} + setup_color() { # Only use colors if connected to a terminal if [ -t 1 ]; then @@ -269,11 +273,13 @@ main() { /____/ ....is now installed! + EOF + cat <<-EOF 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 - • Get stickers, shirts, coffee mugs and other swag: https://shop.planetargon.com/collections/oh-my-zsh + • Follow us on Twitter: $(underline https://twitter.com/ohmyzsh) + • Join our Discord server: $(underline https://discord.gg/ohmyzsh) + • Get stickers, shirts, coffee mugs and other swag: $(underline https://shop.planetargon.com/collections/oh-my-zsh) EOF printf "$RESET" diff --git a/tools/upgrade.sh b/tools/upgrade.sh index de7a8419b..a71dec88b 100644 --- a/tools/upgrade.sh +++ b/tools/upgrade.sh @@ -14,6 +14,7 @@ if [ -t 1 ]; then YELLOW=$(printf '\033[33m') BLUE=$(printf '\033[34m') BOLD=$(printf '\033[1m') + UNDER=$(printf '\033[4m') RESET=$(printf '\033[m') else RB_RED="" @@ -28,6 +29,7 @@ else GREEN="" YELLOW="" BLUE="" + UNDER="" BOLD="" RESET="" fi @@ -62,9 +64,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 "${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" "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 ${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 ${UNDER}%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" else printf "${RED}%s${RESET}\n" 'There was an error updating. Try again later?' fi -- cgit v1.2.3-70-g09d2 From 93f8c0686cd28d3f93810c4824397f21530899c7 Mon Sep 17 00:00:00 2001 From: "Adam G. Emerson" <35545129+AdamGEmerson@users.noreply.github.com> Date: Thu, 20 Aug 2020 04:26:39 -0500 Subject: docs: add fetch install command for FreeBSD (#9172) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Marc Cornellà --- README.md | 6 ++++++ tools/install.sh | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/README.md b/README.md index 329eff178..8dfa4a139 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,12 @@ sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/too sh -c "$(wget -O- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" ``` +#### via fetch + +```shell +sh -c "$(fetch -o - https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" +``` + #### Manual inspection It's a good idea to inspect the install script from projects you don't yet know. You can do diff --git a/tools/install.sh b/tools/install.sh index 0fc554786..4e166fef4 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -2,8 +2,10 @@ # # This script should be run via curl: # sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" -# or wget: +# or via wget: # sh -c "$(wget -qO- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" +# or via fetch: +# sh -c "$(fetch -o - https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" # # As an alternative, you can first download the install script and run it afterwards: # wget https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh -- cgit v1.2.3-70-g09d2 From 03b6a72576cb0f0b53abde25d409e8026d5c4ee9 Mon Sep 17 00:00:00 2001 From: Marc Cornellà Date: Thu, 20 Aug 2020 11:28:10 +0200 Subject: docs: document oneline argument passing to install script --- tools/install.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tools') diff --git a/tools/install.sh b/tools/install.sh index 4e166fef4..61b21cb9e 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -32,6 +32,8 @@ # --keep-zshrc: sets KEEP_ZSHRC to 'yes' # For example: # sh install.sh --unattended +# or: +# sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended # set -e -- cgit v1.2.3-70-g09d2