Skip to content

Commit

Permalink
[CI-SKIP] Misc script changes (Closes PaperMC#4346)
Browse files Browse the repository at this point in the history
testserver - use printf instead of echo, as echo is apparently
              inconsistent across environments
requireDeps - change message slightly, maybe more useful to people?
  • Loading branch information
electronicboy committed Nov 29, 2020
1 parent ab1a7c9 commit bfa122a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions scripts/functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion scripts/requireDeps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit bfa122a

Please sign in to comment.