0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid subjecting variable expansions to echo -e

Browse source 
Also consistently use tput instead of mixing in hardcoded escape sequences.
This commit is contained in:
Gunter Labes 2022-06-10 11:51:04 +02:00 • committed by GitHub
parent 05d36f77aa
commit 782cc4a27f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
.github/workflows/ci-scripts/docker.sh vendored
View file

@ -16,6 +16,7 @@ export DISPLAY=:99.0
/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1024x768x24
red=$(tput setaf 1)
blue=$(tput setaf 4)
reset=$(tput sgr0)
# print given message in red
error() { printf '%s%s%s\n' "$red" "$*" "$reset"; }
@ -25,20 +26,16 @@ die() { error "$*"; exit 1; }
# print given message ($1) and execute given command; sets EXIT_VAL on failure
execute() {
local message=$1; shift
echo
echo -e "\e[1;34m -~=+=~- ${message//?/-}\e[0m"
echo -e "\e[1;34mExecuting $message\e[0m"
echo -e "\e[1;34m -~=+=~- ${message//?/-}\e[0m"
echo
printf '\n%s -~=+=~- %s\nExecuting %s\n -~=+=~- %s%s\n\n' "$blue" "${message//?/-}" "$message" "${message//?/-}" "$reset"
if "$@"; then
: # success
else
EXIT_VAL=$?
echo -e "\e[1;31m********** !FAILURE! **********\e[0m"
echo -e "\e[1;31m********** !FAILURE! **********\e[0m"
echo -e "\e[1;31m********** !FAILURE! **********\e[0m"
echo -e "\e[1;31m********** !FAILURE! **********\e[0m"
echo -e "\e[1;31m********** !FAILURE! **********\e[0m"
error '********** !FAILURE! **********'
error '********** !FAILURE! **********'
error '********** !FAILURE! **********'
error '********** !FAILURE! **********'
error '********** !FAILURE! **********'
echo
error "$message failed! ($*)"
echo