diff options
| author | Shane Freeder <[email protected]> | 2020-11-29 06:24:39 +0000 |
|---|---|---|
| committer | Shane Freeder <[email protected]> | 2020-11-29 06:24:39 +0000 |
| commit | bfa122ae6af5a6d5c50362baad6d48ca45a27e0f (patch) | |
| tree | 6260cdad4d8e1c7348d50f9c0fc45adcdcee07f9 /scripts | |
| parent | ab1a7c94df1536b83ae61c6ab773b683a8cb6e67 (diff) | |
| download | Paper-bfa122ae6af5a6d5c50362baad6d48ca45a27e0f.tar.gz Paper-bfa122ae6af5a6d5c50362baad6d48ca45a27e0f.zip | |
[CI-SKIP] Misc script changes (Closes #4346)
testserver - use printf instead of echo, as echo is apparently
inconsistent across environments
requireDeps - change message slightly, maybe more useful to people?
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/functions.sh | 6 | ||||
| -rwxr-xr-x | scripts/requireDeps.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/functions.sh b/scripts/functions.sh index 6033e03efe..fecad9922d 100755 --- a/scripts/functions.sh +++ b/scripts/functions.sh @@ -4,13 +4,13 @@ gitcmd="git -c commit.gpgsign=false" color() { if [ $2 ]; then - echo -e "\e[$1;$2m" + printf "\e[$1;$2m" else - echo -e "\e[$1m" + printf "\e[$1m" fi } colorend() { - echo -e "\e[m" + printf "\e[m" } paperstash() { diff --git a/scripts/requireDeps.sh b/scripts/requireDeps.sh index b64412f35f..ac3f843fd6 100755 --- a/scripts/requireDeps.sh +++ b/scripts/requireDeps.sh @@ -4,7 +4,7 @@ set -ue # Check if an application is on the PATH. # If it is not, return with non-zero. _is_dep_available() { - command -v "$1" >/dev/null || (echo "$1 ${2:-was not found and is a required dependency}"; return 1) + command -v "$1" >/dev/null || (echo "\`$1\` ${2:-command was not found in the path and is a required dependency}"; return 1) } if [ -z "${1:-}" ]; then |