From 532ab6c6ee1e529cc98e4d85cd27d5664d2752ac Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@operamail.com>
Date: Sat, 18 Aug 2012 01:56:08 +0200
Subject: but i wasn't prepared for this

---
 ponysay    | 14 +++++++-------
 pq4ps      | 14 ++++++--------
 pq4ps-list |  2 +-
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/ponysay b/ponysay
index b27905e..0d0beee 100755
--- a/ponysay
+++ b/ponysay
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERSION=1.4
+VERSION=1.4.1
 
 
 
@@ -90,7 +90,7 @@ _linklist() {
 	for file in $files; do
 		target=$(readlink $1"/"$file".pony")
 		
-		if [[ $target = "" ]]; then
+		if [ $target = "" ]; then
 			target=$file
 		else
 			target=$(echo $target | sed -e 's/^\.\///g' -e 's/\.pony$//g')
@@ -114,7 +114,7 @@ linklist() {
 # Pony quotes
 ponyquotes() {
 	[ "$TERM" = "-linux-" ] && TERM="linux"
-	"$0" ${wrap:+-W$wrap} $("$quotecmd" "$*")
+	"$0" ${wrap:+-W$wrap} $("$quotecmd" $@)
 }
 
 # Usage help print function
@@ -146,7 +146,7 @@ say() {
 	export PERL_UNICODE=S
 
 	# Clear screen in TTY
-	( [ "$TERM" = "linux" ] || [ "$TERM" = "-linux-" ]) && echo -ne '\e[H\e[2J'
+	( [ "$TERM" = "linux" ] || [ "$TERM" = "-linux-" ] ) && echo -ne '\e[H\e[2J'
 
 	# Set PONYSAY_SHELL_LINES to default if not specified
 	[ "$PONYSAY_SHELL_LINES" = "" ] && PONYSAY_SHELL_LINES=2
@@ -156,7 +156,7 @@ say() {
 		if [ "$PONYSAY_FULL_WIDTH" = 'yes' ] || [ "$PONYSAY_FULL_WIDTH" = 'y' ] || [ "$PONYSAY_FULL_WIDTH" = '1' ]; then
 			cat
 		else
-			if [[ -f $truncatercmd ]]; then
+			if [ -f $truncatercmd ]; then
 				$truncatercmd $scrw
 			else
 				cat
@@ -220,7 +220,7 @@ say() {
 
 
 # If no stdin and no arguments then print usage and exit
-if [ -t 0 && $# == 0 ]; then
+if [ -t 0 ] && [ $# == 0 ]; then
 	usage
 	exit
 fi
@@ -236,7 +236,7 @@ while getopts "f:W:Llhvq" OPT; do
 		l)  list; exit ;;
 		L)  linklist; exit ;;
 		W)  wrap="$OPTARG" ;;
-		q)  ponyquotes; exit ;;
+		q)  shift $((OPTIND - 1)); ponyquotes "$*"; exit ;;
 		\?) usage >&2; exit 1 ;;
 	esac
 done
diff --git a/pq4ps b/pq4ps
index 513bcec..576a4e8 100755
--- a/pq4ps
+++ b/pq4ps
@@ -1,26 +1,24 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 INSTALLDIR="$(dirname "$(dirname "$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )")")" # Get main bash script directory's parent
 
-if [ $# == 1 ] && [ "$1" == '-l' || "$1" == '--list' ]; then
+if [ $# == 1 ] && ([ "$1" == '-l' ] || [ "$1" == '--list' ]); then
     perl "$0.pl" "$INSTALLDIR" | cut -d @ -f 1 | uniq
 else
     _ponies="$(perl "$0.pl" "$INSTALLDIR")"
     ponies=()
     
-    if (( $# > 1 )); then
+    if (( $# > 0 )); then
 	p=()
 	for arg in "$@"; do
-	    p+=( $(echo "$_ponies" | grep "^$arg@") )
+	    p+="$(echo "$_ponies" | grep "^$arg@") "
 	done
 	_ponies=$p
     fi
     
-    for _pony in $_ponies; do
-	ponies+=( $_pony )
-    done
+    ponies=( $_ponies )
     
-    if [[ ${#ponies[@]} == 0 ]]; then
+    if (( ${#ponies[@]} == 0 )); then
 	ponies=()
 	for arg in "$@"; do
 	    ponies+=( "$arg" )
diff --git a/pq4ps-list b/pq4ps-list
index 8febce4..99203ba 100755
--- a/pq4ps-list
+++ b/pq4ps-list
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 cmd="$(echo "$0" | sed -e 's/\-list$//g')"
 pl="$0.pl"
-- 
cgit