Unbreak providing the message via argument. Whoops

This commit is contained in:
Jan Alexander Steffens (heftig) 2012-02-26 20:30:25 +01:00
parent 7039eab517
commit 38f8c51bba

24
ponysay
View file

@ -17,7 +17,9 @@ usage() {
version
echo
echo "Usage:"
echo "${0##*/} [options]"
echo "${0##*/} [options] [message]"
echo
echo "If [message] is not provided, reads the message from STDIN"
echo
echo "Options:"
echo " -v Show version and exit"
@ -26,6 +28,10 @@ usage() {
echo " -W[column] The screen column where the message should be wrapped"
}
say() {
exec "$cmd" -f "$pony" "${wrap:+-W$wrap}"
}
while getopts f:W:hv OPT
do
case ${OPT} in
@ -36,23 +42,31 @@ do
\?) usage >&2; exit 1 ;;
esac
done
shift $((OPTIND - 1))
# Pony not a file? Search for it
if [[ ! -f $pony ]]; then
# Pony not a file? Search for it
ponies=()
[[ -d $SYSTEMPONIES ]] && ponies+=( "$SYSTEMPONIES"/$pony.pony )
[[ -d $HOMEPONIES ]] && ponies+=( "$HOMEPONIES"/$pony.pony )
if (( ${#ponies} < 1 )); then
echo >&2 "All the ponies are missing! Call the Princess!"
exit 1
echo >&2 "All the ponies are missing! Call the Princess!"
exit 1
fi
# Choose a random pony
pony="${ponies[$RANDOM%${#ponies[@]}]}"
fi
# Ponies use UTF-8 drawing characters. Prevent a Perl warning.
export PERL_UNICODE=S
exec "$cmd" -f "$pony" "${wrap:+-W$wrap}"
if [[ -n "$*" ]]; then
# Handle a message given via arguments
say <<<"$*"
else
say
fi