PonyMirrors/ponysay
1
0
Fork 0
mirror of https://github.com/erkin/ponysay.git synced 2025-01-31 18:36:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

fixing ponythink bug I introduced

Browse source
This commit is contained in:
Mattias Andrée 2012-07-20 05:46:58 +02:00
parent 122f1da602
commit d9d620f980
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
ponysay
View file

@ -19,7 +19,14 @@ else
cmd="$PONYSAY_COWSAY" cmd="$PONYSAY_COWSAY"
customcmd=1 customcmd=1
fi fi
[[ ${0} == *ponythink ]] && cmd=cowthink [[ ${0} == *ponythink ]] &&
if [[ "$PONYSAY_COWTHINK" = "" ]]; then
cmd=cowthink
customcmd=0
else
cmd="$PONYSAY_COWTHINK"
customcmd=1
fi
version() { version() {
echo "ponysay v$version" echo "ponysay v$version"
@ -73,7 +80,7 @@ _linklist() {
scrw=`(stty size <&2 || echo 0 0) | cut -d ' ' -f 2` scrw=`(stty size <&2 || echo 0 0) | cut -d ' ' -f 2`
perl '/dev/stdin' $(echo $args) <<EOF | sed -e 's/ /_/g' > /dev/shm/.ponysay~ perl '/dev/stdin' $(echo $args) <<EOF | sed -e 's/ /_/g' > '/dev/shm/.ponysay~'
#!/usr/bin/perl #!/usr/bin/perl
#Author: Mattias Andrée (maandree@kth.se) #Author: Mattias Andrée (maandree@kth.se)
@ -140,7 +147,8 @@ while (\$i < \$argc)
} }
EOF EOF
perl $listcmd $scrw $(cat /dev/shm/.ponysay~) | sed -e 's/_/ /g' | qlist perl $listcmd $scrw $(cat "/dev/shm/.ponysay~") | sed -e 's/_/ /g' | qlist
rm '/dev/shm/.ponysay~'
} }
linklist() { linklist() {
@ -217,13 +225,22 @@ say() {
if [[ $customcmd = 0 ]]; then if [[ $customcmd = 0 ]]; then
function cowcmd function cowcmd
{ {
echo "standrd $cmd"
pcmd='#!/usr/bin/perl\nuse utf8;' pcmd='#!/usr/bin/perl\nuse utf8;'
ccmd=$(for c in $(echo $PATH":" | sed -e 's/:/\/'"$cmd"' /g'); do if [[ -f $c ]]; then echo $c; break; fi done) ccmd=$(for c in $(echo $PATH":" | sed -e 's/:/\/'"$cmd"' /g'); do if [[ -f $c ]]; then echo $c; break; fi done)
perl <(cat <(echo -e $pcmd) $ccmd) "$@" echo "is $cmd"
if [[ ${0} == *ponythink ]]; then
cat <(echo -e $pcmd) $ccmd > "/dev/shm/.ponythink"
perl '/dev/shm/.ponythink' "$@"
rm '/dev/shm/.ponythink'
else
perl <(cat <(echo -e $pcmd) $ccmd) "$@"
fi
} }
else else
function cowcmd function cowcmd
{ {
echo "custom $cmd"
$cmd "$@" $cmd "$@"
} }
fi fi