From 2663a62ca3810129739451e89126c2cc79c08cb4 Mon Sep 17 00:00:00 2001 From: Brad Solomon <81818815+brsolomon-deloitte@users.noreply.github.com> Date: Wed, 6 Oct 2021 10:41:49 -0400 Subject: [PATCH 1/2] Use curl -fsSL -o- consistently Add some flags to curl to raise error on failed request and ensure output is stdout. Use bash rather than text blocks. Signed-off-by: Brad Solomon <81818815+brsolomon-deloitte@users.noreply.github.com> --- installation/install-by-deb.md | 54 +++++++++++++++++----------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/installation/install-by-deb.md b/installation/install-by-deb.md index 8ed3604f..0ea826e7 100644 --- a/installation/install-by-deb.md +++ b/installation/install-by-deb.md @@ -32,64 +32,64 @@ A shell script is provided to automate the installation process for each version For Ubuntu Focal: -```text +```bash # td-agent 4 -curl -L https://toolbelt.treasuredata.com/sh/install-ubuntu-focal-td-agent4.sh | sh +curl -fsSL -o- https://toolbelt.treasuredata.com/sh/install-ubuntu-focal-td-agent4.sh | sh ``` For Ubuntu Bionic: -```text +```bash # td-agent 4 -curl -L https://toolbelt.treasuredata.com/sh/install-ubuntu-bionic-td-agent4.sh | sh +curl -fsSL -o- https://toolbelt.treasuredata.com/sh/install-ubuntu-bionic-td-agent4.sh | sh # td-agent 3 -curl -L https://toolbelt.treasuredata.com/sh/install-ubuntu-bionic-td-agent3.sh | sh +curl -fsSL -o- https://toolbelt.treasuredata.com/sh/install-ubuntu-bionic-td-agent3.sh | sh ``` For Ubuntu Xenial: -```text +```bash # td-agent 4 -curl -L https://toolbelt.treasuredata.com/sh/install-ubuntu-xenial-td-agent4.sh | sh +curl -fsSL -o- https://toolbelt.treasuredata.com/sh/install-ubuntu-xenial-td-agent4.sh | sh # td-agent 3 -curl -L https://toolbelt.treasuredata.com/sh/install-ubuntu-xenial-td-agent3.sh | sh +curl -fsSL -o- https://toolbelt.treasuredata.com/sh/install-ubuntu-xenial-td-agent3.sh | sh ``` For Ubuntu Trusty: -```text +```bash # td-agent 3 -curl -L https://toolbelt.treasuredata.com/sh/install-ubuntu-trusty-td-agent3.sh | sh +curl -fsSL -o- https://toolbelt.treasuredata.com/sh/install-ubuntu-trusty-td-agent3.sh | sh ``` For Debian Bullseye: -```text +```bash # td-agent 4 -curl -L https://toolbelt.treasuredata.com/sh/install-debian-bullseye-td-agent4.sh | sh +curl -fsSL -o- https://toolbelt.treasuredata.com/sh/install-debian-bullseye-td-agent4.sh | sh ``` For Debian Buster: -```text +```bash # td-agent 4 -curl -L https://toolbelt.treasuredata.com/sh/install-debian-buster-td-agent4.sh | sh +curl -fsSL -o- https://toolbelt.treasuredata.com/sh/install-debian-buster-td-agent4.sh | sh # td-agent 3 -curl -L https://toolbelt.treasuredata.com/sh/install-debian-buster-td-agent3.sh | sh +curl -fsSL -o- https://toolbelt.treasuredata.com/sh/install-debian-buster-td-agent3.sh | sh ``` For Debian Stretch: -```text +```bash # td-agent 3 -curl -L https://toolbelt.treasuredata.com/sh/install-debian-stretch-td-agent3.sh | sh +curl -fsSL -o- https://toolbelt.treasuredata.com/sh/install-debian-stretch-td-agent3.sh | sh ``` For Debian Jessie: -```text +```bash # td-agent 3 -curl -L https://toolbelt.treasuredata.com/sh/install-debian-jessie-td-agent3.sh | sh +curl -fsSL -o- https://toolbelt.treasuredata.com/sh/install-debian-jessie-td-agent3.sh | sh ``` ### Step 2: Launch Daemon @@ -170,30 +170,30 @@ A shell script is provided to automate the installation process for each version For Ubuntu Focal: -```text +```bash # calyptia-fluentd 1 -curl -L https://calyptia-fluentd.s3.us-east-2.amazonaws.com/calyptia-fluentd-1-ubuntu-focal.sh | sh +curl -fsSL -o- https://calyptia-fluentd.s3.us-east-2.amazonaws.com/calyptia-fluentd-1-ubuntu-focal.sh | sh ``` For Ubuntu Bionic: -```text +```bash # calyptia-fluentd 1 -curl -L https://calyptia-fluentd.s3.us-east-2.amazonaws.com/calyptia-fluentd-1-ubuntu-bionic.sh | sh +curl -fsSL -o- https://calyptia-fluentd.s3.us-east-2.amazonaws.com/calyptia-fluentd-1-ubuntu-bionic.sh | sh ``` For Ubuntu Xenial: -```text +```bash # calyptia-fluentd 1 -curl -L https://calyptia-fluentd.s3.us-east-2.amazonaws.com/calyptia-fluentd-1-ubuntu-xenial.sh | sh +curl -fsSL -o- https://calyptia-fluentd.s3.us-east-2.amazonaws.com/calyptia-fluentd-1-ubuntu-xenial.sh | sh ``` For Debian Buster: -```text +```bash # calyptia-fluentd 1 -https://calyptia-fluentd.s3.us-east-2.amazonaws.com/calyptia-fluentd-1-debian-buster.sh +curl -fsSL -o- https://calyptia-fluentd.s3.us-east-2.amazonaws.com/calyptia-fluentd-1-debian-buster.sh | sh ``` ### Step 2: Launch Daemon From b2c2f067f7f126f4d683d1450d5ef67f76b7392d Mon Sep 17 00:00:00 2001 From: Brad Solomon <81818815+brsolomon-deloitte@users.noreply.github.com> Date: Thu, 7 Oct 2021 08:23:30 -0400 Subject: [PATCH 2/2] remove redundant -o- to curl, default is stdout Signed-off-by: Brad Solomon <81818815+brsolomon-deloitte@users.noreply.github.com> --- installation/install-by-deb.md | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/installation/install-by-deb.md b/installation/install-by-deb.md index 0ea826e7..ada29b3d 100644 --- a/installation/install-by-deb.md +++ b/installation/install-by-deb.md @@ -34,62 +34,62 @@ For Ubuntu Focal: ```bash # td-agent 4 -curl -fsSL -o- https://toolbelt.treasuredata.com/sh/install-ubuntu-focal-td-agent4.sh | sh +curl -fsSL https://toolbelt.treasuredata.com/sh/install-ubuntu-focal-td-agent4.sh | sh ``` For Ubuntu Bionic: ```bash # td-agent 4 -curl -fsSL -o- https://toolbelt.treasuredata.com/sh/install-ubuntu-bionic-td-agent4.sh | sh +curl -fsSL https://toolbelt.treasuredata.com/sh/install-ubuntu-bionic-td-agent4.sh | sh # td-agent 3 -curl -fsSL -o- https://toolbelt.treasuredata.com/sh/install-ubuntu-bionic-td-agent3.sh | sh +curl -fsSL https://toolbelt.treasuredata.com/sh/install-ubuntu-bionic-td-agent3.sh | sh ``` For Ubuntu Xenial: ```bash # td-agent 4 -curl -fsSL -o- https://toolbelt.treasuredata.com/sh/install-ubuntu-xenial-td-agent4.sh | sh +curl -fsSL https://toolbelt.treasuredata.com/sh/install-ubuntu-xenial-td-agent4.sh | sh # td-agent 3 -curl -fsSL -o- https://toolbelt.treasuredata.com/sh/install-ubuntu-xenial-td-agent3.sh | sh +curl -fsSL https://toolbelt.treasuredata.com/sh/install-ubuntu-xenial-td-agent3.sh | sh ``` For Ubuntu Trusty: ```bash # td-agent 3 -curl -fsSL -o- https://toolbelt.treasuredata.com/sh/install-ubuntu-trusty-td-agent3.sh | sh +curl -fsSL https://toolbelt.treasuredata.com/sh/install-ubuntu-trusty-td-agent3.sh | sh ``` For Debian Bullseye: ```bash # td-agent 4 -curl -fsSL -o- https://toolbelt.treasuredata.com/sh/install-debian-bullseye-td-agent4.sh | sh +curl -fsSL https://toolbelt.treasuredata.com/sh/install-debian-bullseye-td-agent4.sh | sh ``` For Debian Buster: ```bash # td-agent 4 -curl -fsSL -o- https://toolbelt.treasuredata.com/sh/install-debian-buster-td-agent4.sh | sh +curl -fsSL https://toolbelt.treasuredata.com/sh/install-debian-buster-td-agent4.sh | sh # td-agent 3 -curl -fsSL -o- https://toolbelt.treasuredata.com/sh/install-debian-buster-td-agent3.sh | sh +curl -fsSL https://toolbelt.treasuredata.com/sh/install-debian-buster-td-agent3.sh | sh ``` For Debian Stretch: ```bash # td-agent 3 -curl -fsSL -o- https://toolbelt.treasuredata.com/sh/install-debian-stretch-td-agent3.sh | sh +curl -fsSL https://toolbelt.treasuredata.com/sh/install-debian-stretch-td-agent3.sh | sh ``` For Debian Jessie: ```bash # td-agent 3 -curl -fsSL -o- https://toolbelt.treasuredata.com/sh/install-debian-jessie-td-agent3.sh | sh +curl -fsSL https://toolbelt.treasuredata.com/sh/install-debian-jessie-td-agent3.sh | sh ``` ### Step 2: Launch Daemon @@ -172,28 +172,28 @@ For Ubuntu Focal: ```bash # calyptia-fluentd 1 -curl -fsSL -o- https://calyptia-fluentd.s3.us-east-2.amazonaws.com/calyptia-fluentd-1-ubuntu-focal.sh | sh +curl -fsSL https://calyptia-fluentd.s3.us-east-2.amazonaws.com/calyptia-fluentd-1-ubuntu-focal.sh | sh ``` For Ubuntu Bionic: ```bash # calyptia-fluentd 1 -curl -fsSL -o- https://calyptia-fluentd.s3.us-east-2.amazonaws.com/calyptia-fluentd-1-ubuntu-bionic.sh | sh +curl -fsSL https://calyptia-fluentd.s3.us-east-2.amazonaws.com/calyptia-fluentd-1-ubuntu-bionic.sh | sh ``` For Ubuntu Xenial: ```bash # calyptia-fluentd 1 -curl -fsSL -o- https://calyptia-fluentd.s3.us-east-2.amazonaws.com/calyptia-fluentd-1-ubuntu-xenial.sh | sh +curl -fsSL https://calyptia-fluentd.s3.us-east-2.amazonaws.com/calyptia-fluentd-1-ubuntu-xenial.sh | sh ``` For Debian Buster: ```bash # calyptia-fluentd 1 -curl -fsSL -o- https://calyptia-fluentd.s3.us-east-2.amazonaws.com/calyptia-fluentd-1-debian-buster.sh | sh +curl -fsSL https://calyptia-fluentd.s3.us-east-2.amazonaws.com/calyptia-fluentd-1-debian-buster.sh | sh ``` ### Step 2: Launch Daemon