core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[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?
This commit is contained in:
Shane Freeder 2020-11-29 06:24:39 +00:00
parent ab1a7c94df
commit bfa122ae6a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/functions.sh
View File

@ -4,13 +4,13 @@ gitcmd="git -c commit.gpgsign=false"
color() { color() {
if [ $2 ]; then if [ $2 ]; then
echo -e "\e[$1;$2m" printf "\e[$1;$2m"
else else
echo -e "\e[$1m" printf "\e[$1m"
fi fi
} }
colorend() { colorend() {
echo -e "\e[m" printf "\e[m"
} }
paperstash() { paperstash() {

2
scripts/requireDeps.sh
View File

@ -4,7 +4,7 @@ set -ue
# Check if an application is on the PATH. # Check if an application is on the PATH.
# If it is not, return with non-zero. # If it is not, return with non-zero.
_is_dep_available() { _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 if [ -z "${1:-}" ]; then