From 48027afd0ec52f6a37249994f5995b6f8dacf3bd Mon Sep 17 00:00:00 2001 From: Joseph Montanaro <=> Date: Fri, 21 Jan 2022 10:52:23 -0800 Subject: [PATCH] adjust script output --- .drone.yml | 3 +-- run.sh | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index 289960a..f6326f6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,5 +13,4 @@ steps: SLACK_HOOK_URL: from_secret: slack_hook_url commands: - - chmod +x run.sh - - ./run.sh \ No newline at end of file + - bash run.sh diff --git a/run.sh b/run.sh index 9909cb0..198018b 100644 --- a/run.sh +++ b/run.sh @@ -1,10 +1,10 @@ -set +x - # capture output so we can display conditionally -INSTALL_OUTPUT=$(pip install requests) +# also simulate -x manually just for the heck of it +INSTALL_OUTPUT=$(pip install requests 2>&1) if [[ $? > 0 ]]; then + echo "+ pip install requests" echo "$INSTALL_OUTPUT" exit 1 fi -python bot.py \ No newline at end of file +python bot.py