aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xponysay.py22
-rwxr-xr-xponysay.sh11
2 files changed, 13 insertions, 20 deletions
diff --git a/ponysay.py b/ponysay.py
index 1f52558..969ecb6 100755
--- a/ponysay.py
+++ b/ponysay.py
@@ -367,15 +367,19 @@ class ponysay():
alts.append(pair)
pairs = alts
- pair = pairs[random.randrange(0, len(pairs))]
- qfile = None
- try:
- qfile = open(pair[1], 'r')
- args.message = '\n'.join(qfile.readlines())
- finally:
- if qfile is not None:
- qfile.close()
- args.pony = [pair[0]]
+ if not len(pairs) == 0:
+ pair = pairs[random.randrange(0, len(pairs))]
+ qfile = None
+ try:
+ qfile = open(pair[1], 'r')
+ args.message = '\n'.join(qfile.readlines()).strip()
+ finally:
+ if qfile is not None:
+ qfile.close()
+ args.pony = [pair[0]]
+ else:
+ args.pony = args.quote
+ args.message = 'I got nuthin\' good to say :('
self.print_pony(args)
diff --git a/ponysay.sh b/ponysay.sh
index 74dca7b..70137bd 100755
--- a/ponysay.sh
+++ b/ponysay.sh
@@ -68,17 +68,6 @@ say() {
fi
}
-
-
-# If no stdin and no arguments then print usage and exit
-if [ -t 0 ] && [ $# == 0 ]; then
- usage
- exit
-fi
-
-
-
-
# Check for cowsay
hash $cmd &>/dev/null; if [ $? -ne 0 ]; then
cat >&2 <<EOF