Fix up bin/cowsay and add bin/cowthink and add cows

Author: scott-linder

Dockerfile

@@ -1,7 +1,7 @@
 FROM python:3.8-alpine
 
 RUN apk add --update \
-        fish perl figlet fortune jq tzdata curl \
+        fish perl figlet fortune jq tzdata curl binutils \
     && rm -rf /var/cache/apk/*
 
 # Recent versions of fish force --color=always
@@ -17,5 +17,14 @@ RUN curl -sSL https://github.com/tnalpgge/rank-amateur-cowsay/archive/cowsay-3.0
     && cd /usr/src/rank-amateur-cowsay-cowsay-3.04 \
     && ./install.sh
 
+RUN mkdir /usr/src/cowsay-buster \
+    && cd /usr/src/cowsay-buster \
+    && curl -sSL http://http.us.debian.org/debian/pool/main/c/cowsay/cowsay_3.03+dfsg2-6_all.deb -o cowsay.deb \
+    && ar x cowsay.deb data.tar.xz \
+    && tar xfJ data.tar.xz --strip-components=5 -C /usr/local/share/cows/ -- ./usr/share/cowsay/cows/
+
+
+COPY cows/* /usr/local/share/cows/
+
 WORKDIR /irsh
 CMD /irsh/init

bin/cowsay

@@ -1,19 +1,14 @@
 #!/usr/bin/fish
 
-set cows apt bud-frogs bunny calvin cheese cock cower daemon default dragon \
-    dragon-and-cow duck elephant elephant-in-snake eyes flaming-sheep \
-    ghostbusters gnu hellokitty kangaroo kiss koala kosh luke-koala \
-    mech-and-cow milk moofasa moose pony pony-smaller ren sheep skeleton \
-    snowman stegosaurus stimpy suse three-eyes turkey turtle tux unipony \
-    unipony-smaller vader vader-koala www
-
 set self (basename (status -f))
-argparse -n$self -xf,r n f= r W= e= T= b d g p s t w y -- $argv >/dev/null ^&1
+argparse -n$self -xf,r n f= r l W= e= T= b d g p s t w y -- $argv >/dev/null ^&1
 or begin
-    printf "%s: Invalid commandline" $self >&2
+    printf "%s: Invalid commandline\n" $self >&2
     exit 1
 end
 
+set cows ($self -l | tail -n +2 | tr ' ' '\n')
+
 if set -q _flag_r[1]
     set flag_f -f $cows[(math (random)%(count $cows)+1)]
 else if set -q _flag_f
@@ -37,6 +32,11 @@ set -q _flag_W; and set flag_W -W $_flag_W
 set -q _flag_e; and set flag_e -e $_flag_e
 set -q _flag_T; and set flag_T -T $_flag_T
 
-cowsay $_flag_n[1] $flag_f $flag_W $flag_e $flag_T \
+if set -q _flag_l
+    printf "%s" "$cows"
+    exit 0
+end
+
+$self $_flag_n[1] $flag_f $flag_W $flag_e $flag_T \
     $_flag_b[1] $_flag_d[1] $_flag_g[1] $_flag_p[1] \
     $_flag_s[1] $_flag_t[1] $_flag_w[1] $_flag_y[1] -- $argv

bin/cowthink

@@ -0,0 +1 @@
+cowsay

cows/geordinscupe.cow

@@ -0,0 +1,28 @@
+$the_cow = <<"EOC";
+         $thoughts
+          $thoughts     ,   ,   ,, ,,,,,,, ,,   ,
+          ,,,,,,, ,,,, ,,,,,,,,,,,,,,, ,,,,,,,,,,,
+          ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+          ,,,,,,ooOOoOoooooooooooooooooOoOooo,,,,,,
+         ,, ,         oOOOOOOoOOOOOOOoo           ,,
+        ,,   ,,oOOoOoooooOooOOOOOooOoooooOoOOOo,   ,,
+       ,,, ,,ooo,    ,oo,,ooOo,oOoo,ooo,    ,ooo,, ,,,
+        ,,,ooo     oo,,, ,,,,,,,,,,  , ,oo     ooo,,,
+       ,,,oo,, , ,  ,    ,,,,,,,,,,,    ,      ,oo,,,
+        ,,,o,,,,ooOo,, ,,,ooo,,,oooo,, ,ooOoo,,,,o ,,
+         ,,,o,,,ooo,,,ooooo,,,,, ,ooOoo,,,ooo,,,,,,,
+         ,,,,,oooooooOOOOo,,oO0Oo,,oOOOOooooooo,,,,,
+ ,       ,,,ooooOOOO00OOo,O       O,oOOO0OOOooooo,,,       ,
+ ,O ,    ,,oooOO000000OOOoooOOOOOoooOO000000OOooo,,     , O,
+ ,  oo   ,,oooO0000000OOooooOOoOOOoooOO000000OOooo,,  ,o,  ,
+,,,oooo  ,,,oOO000000OOoOoooooooooooooOO000000OoO,,,  oooo,,
+  ,,o,O,, ,oOO0000000OOO,,0O000O0O0,,oOO0000O00OOo,  ,O,,,,
+    ,,   ,,oOoOO000000O               O000000OOoOo,,   o,
+       , ,,oOOO00O00O0                ,0000O0OOooo, ,,
+       ,,,,,oooO0O0000               ,000O00Oooo,,,,,
+      ,,,,,,,oooO0O000O               O000O0O,oo,, ,, ,
+     ,,,,,,,,,oooOOOOOO,     $tongue      ,OO0OOOoooo,,,,,,,,
+    ,,oo,,,,oooo,oOO0oOo,    ,,,    ooOo0OOo,ooo, ,,,oo,,
+   ,,ooo,  ,oooooooooOoOooOOoOOOoOOooO,Oooooooooo,  ,ooo,,
+   ,ooo,, ,oooooo,oooo0OOOOOOOoOOOOooOOoOoo,oooooo, ,,oooo
+EOC

man/cowsay

@@ -1,16 +1,11 @@
-[-n] [-f cow] [-r] [-W width] [-e eyes] [-T tongue] [-bdgpstwy] [string]
+[-n] [-f cow] [-r] [-l] [-W width] [-e eyes] [-T tongue] [-bdgpstwy] [string]
 
 A speaking cow reads string or stdin.
 
     -n disable forced wrapping (cannot be used when passing string)
-    -f use a different cow. Cannot be used with -r. Valid cows are:
-        apt bud-frogs bunny calvin cheese cock cower daemon default dragon
-        dragon-and-cow duck elephant elephant-in-snake eyes flaming-sheep
-        ghostbusters gnu hellokitty kangaroo kiss koala kosh luke-koala
-        mech-and-cow milk moofasa moose pony pony-smaller ren sheep skeleton
-        snowman stegosaurus stimpy suse three-eyes turkey turtle tux unipony
-        unipony-smaller vader vader-koala www
+    -f use a different cow. Cannot be used with -r.
     -r use a random cow. Cannot be used with -f
+    -l list all available cows
     -W set text wrap width
     -e set eye string
     -T set tongue string

man/cowthink

@@ -0,0 +1 @@
+cowsay