From edbc5b8e1a202cf6800295be9ffe5bd8b848cfb4 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Thu, 19 Jul 2012 23:43:09 +0200 Subject: customcowsay.png --- customcowsay.png | Bin 0 -> 32514 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 customcowsay.png diff --git a/customcowsay.png b/customcowsay.png new file mode 100644 index 0000000..b093c1b Binary files /dev/null and b/customcowsay.png differ -- cgit From 7dced5dd382ecebcde1f84a80f5f734b0fd046c2 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 24 Jul 2012 14:57:44 +0200 Subject: fix ponysay -L + fix for issue 53 --- Makefile | 2 ++ ponysay | 80 ++++++------------------------------------------------ ponysaylinklist.pl | 72 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 72 deletions(-) create mode 100755 ponysaylinklist.pl diff --git a/Makefile b/Makefile index 490c782..d4c6503 100644 --- a/Makefile +++ b/Makefile @@ -61,6 +61,7 @@ install: mkdir -p "$(DESTDIR)/usr/lib/ponysay/" install -s "ponysaytruncater" "$(DESTDIR)/usr/lib/ponysay/truncater" install "ponysaylist.pl" "$(DESTDIR)/usr/lib/ponysay/list.pl" + install "ponysaylinklist.pl" "$(DESTDIR)/usr/lib/ponysay/linklist.pl" mkdir -p "$(DESTDIR)/usr/share/bash-completion/completions/" install "completion/bash-completion.sh" "$(DESTDIR)/usr/share/bash-completion/completions/ponysay" @@ -116,6 +117,7 @@ uninstall: unlink "$(DESTDIR)/usr/bin/ponysay" unlink "$(DESTDIR)/usr/bin/ponythink" unlink "$(DESTDIR)/usr/lib/ponysay/list.pl" + unlink "$(DESTDIR)/usr/lib/ponysay/linklist.pl" unlink "$(DESTDIR)/usr/lib/ponysay/truncater" unlink "$(DESTDIR)/usr/share/licenses/ponysay/COPYING" unlink "$(DESTDIR)/usr/share/bash-completion/completions/ponysay" diff --git a/ponysay b/ponysay index 1c7ff4e..76bc94f 100755 --- a/ponysay +++ b/ponysay @@ -39,7 +39,11 @@ version() { scrw=`(stty size <&2 || echo 0 0) | cut -d ' ' -f 2` listcmd="${SCRIPTDIR}/../lib/ponysay/list.pl" +linklistcmd="${SCRIPTDIR}/../lib/ponysay/linklist.pl" truncatercmd="${SCRIPTDIR}/../lib/ponysay/truncater" +[[ -f "./ponysaylist.pl" ]] && listcmd="./ponysaylist.pl" +[[ -f "./ponysaylinklist.pl" ]] && linklistcmd="./ponysaylinklist.pl" +[[ -f "./ponysaytruncater" ]] && truncatercmd="./ponysaytruncater" haspq=1 if [[ -f './pq4ps-list' ]]; then @@ -87,75 +91,7 @@ _linklist() { scrw=`(stty size <&2 || echo 0 0) | cut -d ' ' -f 2` - perl '/dev/stdin' $(echo $args) < '/dev/shm/.ponysay~' -#!/usr/bin/perl - -#Author: Mattias Andrée (maandree@kth.se) - -%hash = (); -\$argc = @ARGV; - -\$i = 0; -while (\$i < \$argc) -{ - \$source = \$ARGV[\$i]; - \$i += 1; - \$target = \$ARGV[\$i]; - \$i += 1; - if (\$source eq \$target) - { - \$hash{\$source} = [ () ]; - } -} - -\$i = 0; -while (\$i < \$argc) -{ - \$source = \$ARGV[\$i]; - \$i += 1; - \$target = \$ARGV[\$i]; - \$i += 1; - unless (\$source eq \$target) - { - push @{ \$hash{\$target} }, \$source; - } -} - -\$i = 0; -while (\$i < \$argc) -{ - \$source = \$ARGV[\$i]; - \$i += 1; - \$target = \$ARGV[\$i]; - \$i += 1; - if (\$source eq \$target) - { - @list = @{ \$hash{\$source} }; - \$first = 1; - print \$source; - foreach \$link (@list) - { - if (\$first eq 1) - { - print " (".\$link; - \$first = 0; - } - else - { - print " ".\$link; - } - } - if (\$first eq 0) - { - print ")"; - } - print "\n"; - } -} -EOF - - perl $listcmd $scrw $(cat "/dev/shm/.ponysay~") | sed -e 's/_/ /g' | qlist - rm '/dev/shm/.ponysay~' + perl $listcmd $scrw $(perl $linklistcmd $(echo $args) | sed -e 's/ /_/g') | sed -e 's/_/ /g' | qlist } linklist() { @@ -237,9 +173,9 @@ say() { ccmd=$(for c in $(echo $PATH":" | sed -e 's/:/\/'"$cmd"' /g'); do if [[ -f $c ]]; then echo $c; break; fi done) if [[ ${0} == *ponythink ]]; then - cat <(echo -e $pcmd) $ccmd > "/dev/shm/.ponythink" - perl '/dev/shm/.ponythink' "$@" - rm '/dev/shm/.ponythink' + cat <(echo -e $pcmd) $ccmd > "/tmp/.ponythink" + perl '/tmp/.ponythink' "$@" + rm '/tmp/.ponythink' else perl <(cat <(echo -e $pcmd) $ccmd) "$@" fi diff --git a/ponysaylinklist.pl b/ponysaylinklist.pl new file mode 100755 index 0000000..ec6ff9b --- /dev/null +++ b/ponysaylinklist.pl @@ -0,0 +1,72 @@ +#!/usr/bin/perl + +# ponysaylist +# Prints a list of ponies in columns +# +# Licensed under WTFPL +# See COPYING for details + +# Author: Mattias Andrée, maandree@kth.se + + +%hash = (); +$argc = @ARGV; + +$i = 0; +while ($i < $argc) +{ + $source = $ARGV[$i]; + $i += 1; + $target = $ARGV[$i]; + $i += 1; + if ($source eq $target) + { + $hash{$source} = [ () ]; + } +} + +$i = 0; +while ($i < $argc) +{ + $source = $ARGV[$i]; + $i += 1; + $target = $ARGV[$i]; + $i += 1; + unless ($source eq $target) + { + push @{ $hash{$target} }, $source; + } +} + +$i = 0; +while ($i < $argc) +{ + $source = $ARGV[$i]; + $i += 1; + $target = $ARGV[$i]; + $i += 1; + if ($source eq $target) + { + @list = @{ $hash{$source} }; + $first = 1; + print $source; + foreach $link (@list) + { + if ($first eq 1) + { + print " (".$link; + $first = 0; + } + else + { + print " ".$link; + } + } + if ($first eq 0) + { + print ")"; + } + print "\n"; + } +} + -- cgit From 9fc93bbef458d8660bc9322fb637a3c0273a75b7 Mon Sep 17 00:00:00 2001 From: Erkin Batu Altunbaş Date: Tue, 24 Jul 2012 15:28:29 +0200 Subject: svenstaro: make install obviously should correctly have the other deps set up --- Makefile | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 490c782..269c4e5 100644 --- a/Makefile +++ b/Makefile @@ -1,26 +1,21 @@ all: ponysaytruncater manpages infomanual ponythinkcompletion - ponysaytruncater: gcc -o "ponysaytruncater" "ponysaytruncater.c" - manpages: gzip -9 < "manuals/manpage.6" > "manuals/manpage.6.gz" gzip -9 < "manuals/manpage.es.6" > "manuals/manpage.es.6.gz" - infomanual: makeinfo "manuals/ponysay.texinfo" gzip -9 "ponysay.info" - ponythinkcompletion: sed -e 's/ponysay/ponythink/g' <"completion/bash-completion.sh" | sed -e 's/\/ponythink\//\/ponysay\//g' -e 's/\\\/ponythink\\\//\\\/ponysay\\\//g' >"completion/bash-completion-think.sh" sed -e 's/ponysay/ponythink/g' <"completion/fish-completion.fish" | sed -e 's/\/ponythink\//\/ponysay\//g' -e 's/\\\/ponythink\\\//\\\/ponysay\\\//g' >"completion/fish-completion-think.fish" sed -e 's/ponysay/ponythink/g' <"completion/zsh-completion.zsh" | sed -e 's/\/ponythink\//\/ponysay\//g' -e 's/\\\/ponythink\\\//\\\/ponysay\\\//g' >"completion/zsh-completion-think.zsh" - ttyponies: mkdir -p ttyponies for pony in $$(ls --color=no ponies/); do \ @@ -32,7 +27,6 @@ ttyponies: fi \ done - pdfmanual: texi2pdf "manuals/ponysay.texinfo" if [[ -f "ponysay.aux" ]]; then unlink "ponysay.aux"; fi @@ -46,8 +40,7 @@ pdfmanual: if [[ -f "ponysay.tp" ]]; then unlink "ponysay.tp" ; fi if [[ -f "ponysay.vr" ]]; then unlink "ponysay.vr" ; fi - -install: +install: all mkdir -p "$(DESTDIR)/usr/share/ponysay/" mkdir -p "$(DESTDIR)/usr/share/ponysay/ponies" mkdir -p "$(DESTDIR)/usr/share/ponysay/ttyponies" @@ -109,7 +102,6 @@ install: '\\--------------------------------------------------/' @echo '' | ./ponysay -f ./`if [[ "$$TERM" = "linux" ]]; then echo ttyponies; else echo ponies; fi`/pinkiecannon.pony | tail --lines=30 ; echo -e '\n' - uninstall: rm -fr "$(DESTDIR)/usr/share/ponysay/ponies" rm -fr "$(DESTDIR)/usr/share/ponysay/ttyponies" @@ -131,7 +123,6 @@ uninstall: unlink "$(DESTDIR)/usr/share/info/ponysay.info.gz" unlink "$(DESTDIR)/usr/share/info/ponythink.info.gz" - clean: rm -f "ponysaytruncater" rm -f "completion/bash-completion-think.sh" -- cgit From c374d57fd365833807c2e191178848d76828e859 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 24 Jul 2012 16:16:59 +0200 Subject: /tmp/ponythink instead of /tmp/.ponythink --- ponysay | 6 +++--- ponysaylist.pl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ponysay b/ponysay index 76bc94f..0fdcb18 100755 --- a/ponysay +++ b/ponysay @@ -173,9 +173,9 @@ say() { ccmd=$(for c in $(echo $PATH":" | sed -e 's/:/\/'"$cmd"' /g'); do if [[ -f $c ]]; then echo $c; break; fi done) if [[ ${0} == *ponythink ]]; then - cat <(echo -e $pcmd) $ccmd > "/tmp/.ponythink" - perl '/tmp/.ponythink' "$@" - rm '/tmp/.ponythink' + cat <(echo -e $pcmd) $ccmd > "/tmp/ponythink" + perl '/tmp/ponythink' "$@" + rm '/tmp/ponythink' else perl <(cat <(echo -e $pcmd) $ccmd) "$@" fi diff --git a/ponysaylist.pl b/ponysaylist.pl index 72c0a92..401d83b 100755 --- a/ponysaylist.pl +++ b/ponysaylist.pl @@ -17,7 +17,7 @@ foreach $arg (@ARGV) { # Format names from ponyies names $arg =~ s/([a-z])([A-Z])/\1 \2/; - $arg =~ s/_(.*)/\t(\1)/; + #$arg =~ s/_(.*)/\t(\1)/; ## Incompatible with `ponysay -L` if ($first == 1) { $first = 0; -- cgit From b51d03f6263d3ef674f01be9c01a5b6539e61caf Mon Sep 17 00:00:00 2001 From: spider-mario Date: Tue, 24 Jul 2012 16:24:23 +0200 Subject: Rewrote ponysaylist.pl. --- ponysaylist.pl | 71 +++++++++++++++++----------------------------------------- 1 file changed, 20 insertions(+), 51 deletions(-) diff --git a/ponysaylist.pl b/ponysaylist.pl index 401d83b..0e2db56 100755 --- a/ponysaylist.pl +++ b/ponysaylist.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl # ponysaylist # Prints a list of ponies in columns @@ -9,63 +9,32 @@ # Author: Mattias Andrée, maandree@kth.se -$first = 1; -$scrw = 1; -$maxw = 1; +use strict; +use warnings; +use utf8; +use feature qw(say); +use integer; +use List::Util qw(max); -foreach $arg (@ARGV) -{ +my $scrw = shift @ARGV; + +for (@ARGV) { # Format names from ponyies names - $arg =~ s/([a-z])([A-Z])/\1 \2/; - #$arg =~ s/_(.*)/\t(\1)/; ## Incompatible with `ponysay -L` - - if ($first == 1) - { $first = 0; - $scrw = $arg; - } - else - { $w = length $arg; - $maxw = $w if ($w > $maxw); - } + s/(?<=[a-z])(?=[A-Z])/ /; + s/_(.*)/\t($1)/; } -$cols = int (($scrw + 2) / ($maxw + 2)); -$cols = 1 if ($cols < 1); - - -@list = (); - -$first = 1; -$items = 0; -foreach $arg (@ARGV) -{ - if ($first == 1) - { $first = 0; - } - else - { $ws = $maxw - (length $arg); - push @list, $arg.(" "x$ws); - $items += 1; - } -} +my $maxw = max map {length} @ARGV; +my $cols = max 1, (($scrw + 2) / ($maxw + 2)); -$rows = int (($items + $cols - 1) / $cols); -$i = 0; -@rowlist = (); +my @list = map {sprintf "%-${maxw}s", $_} @ARGV; -while ($i < $items) -{ $row = 0; - while (($row < $rows) and ($i < $items)) - { - $rowlist[$row] .= " " unless ($i < $rows); - $rowlist[$row] .= $list[$i]; - $row += 1; - $i += 1; -} } +my $rows = (@list + $cols - 1) / $cols; -foreach $row (@rowlist) -{ - print $row."\n"; +my @rowlist; +for my $i (0 .. $#list) { + push @{$rowlist[$i % $rows]}, $list[$i]; } +say join ' ', @$_ for @rowlist; -- cgit From 4e1655bc0bb213c001848d02342bcdcd60f4f110 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 24 Jul 2012 16:34:44 +0200 Subject: Fix issue #41 --- ponysay | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ponysay b/ponysay index 0fdcb18..1afb742 100755 --- a/ponysay +++ b/ponysay @@ -1,19 +1,23 @@ #!/usr/bin/env bash version=1.1 -SYSTEMPONIES="/usr/share/ponysay/ponies" -HOMEPONIES="${HOME}/.local/share/ponysay/ponies" SCRIPTDIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # Get bash script directory pony="*" wrap="" +SYSTEMPONIES="$(dirname $SCRIPTDIR)/share/ponysay" +HOMEPONIES="${HOME}/.local/share/ponysay" + kmscmd="" [[ "$TERM" = "linux" ]] && kmscmd=$(for c in $(echo $PATH":" | sed -e 's/:/\/ponysay2kmsponysay /g'); do if [[ -f $c ]]; then echo $c; break; fi done) [[ ! "$kmscmd" = "" ]] && TERM="-linux-" if [ "$TERM" = "linux" ]; then - SYSTEMPONIES="/usr/share/ponysay/ttyponies" - HOMEPONIES="${HOME}/.local/share/ponysay/ttyponies" + SYSTEMPONIES="$SYSTEMPONIES/ttyponies" + HOMEPONIES="$HOMEPONIES/ttyponies" +else + SYSTEMPONIES="$SYSTEMPONIES/ponies" + HOMEPONIES="$HOMEPONIES/ponies" fi if [[ "$PONYSAY_COWSAY" = "" ]]; then -- cgit From 5c12c02d7da938244e58635030210cde87bf2db3 Mon Sep 17 00:00:00 2001 From: Erkin Batu Altunbaş Date: Tue, 24 Jul 2012 17:37:42 +0300 Subject: Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index c0b33dd..ec1f3b0 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,8 @@ The package is in the official repositories as `community/ponysay`. #### Gentoo Linux There is a package for Gentoo, to make installation and keeping it up to date easy. You can find it in [this overlay](/etu/aidstu-overlay). The package is named `games-misc/ponysay`. +#### Debian/Ubuntu +The DEB file can be found [here](http://roryholland.co.uk/misc.html#ponysay). ### Pony fortune on terminal startup -- cgit From e928a02e8a4a1fa2f4d68d109e2d9080e7b0d0a6 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 24 Jul 2012 16:40:58 +0200 Subject: Revert "Merge pull request #54 from spider-mario/master" Error at line 29 This reverts commit 39341e46e62abadd299beec0b6a2dadb5694f282, reversing changes made to 4e1655bc0bb213c001848d02342bcdcd60f4f110. --- ponysaylist.pl | 71 +++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 51 insertions(+), 20 deletions(-) diff --git a/ponysaylist.pl b/ponysaylist.pl index 0e2db56..401d83b 100755 --- a/ponysaylist.pl +++ b/ponysaylist.pl @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl # ponysaylist # Prints a list of ponies in columns @@ -9,32 +9,63 @@ # Author: Mattias Andrée, maandree@kth.se -use strict; -use warnings; -use utf8; -use feature qw(say); -use integer; -use List::Util qw(max); +$first = 1; +$scrw = 1; +$maxw = 1; -my $scrw = shift @ARGV; - -for (@ARGV) { +foreach $arg (@ARGV) +{ # Format names from ponyies names - s/(?<=[a-z])(?=[A-Z])/ /; - s/_(.*)/\t($1)/; + $arg =~ s/([a-z])([A-Z])/\1 \2/; + #$arg =~ s/_(.*)/\t(\1)/; ## Incompatible with `ponysay -L` + + if ($first == 1) + { $first = 0; + $scrw = $arg; + } + else + { $w = length $arg; + $maxw = $w if ($w > $maxw); + } } -my $maxw = max map {length} @ARGV; +$cols = int (($scrw + 2) / ($maxw + 2)); +$cols = 1 if ($cols < 1); + + +@list = (); + +$first = 1; +$items = 0; +foreach $arg (@ARGV) +{ + if ($first == 1) + { $first = 0; + } + else + { $ws = $maxw - (length $arg); + push @list, $arg.(" "x$ws); + $items += 1; + } +} -my $cols = max 1, (($scrw + 2) / ($maxw + 2)); -my @list = map {sprintf "%-${maxw}s", $_} @ARGV; +$rows = int (($items + $cols - 1) / $cols); +$i = 0; +@rowlist = (); -my $rows = (@list + $cols - 1) / $cols; +while ($i < $items) +{ $row = 0; + while (($row < $rows) and ($i < $items)) + { + $rowlist[$row] .= " " unless ($i < $rows); + $rowlist[$row] .= $list[$i]; + $row += 1; + $i += 1; +} } -my @rowlist; -for my $i (0 .. $#list) { - push @{$rowlist[$i % $rows]}, $list[$i]; +foreach $row (@rowlist) +{ + print $row."\n"; } -say join ' ', @$_ for @rowlist; -- cgit From e36fdec84b75c22205f0bbe4318b12a304ff2059 Mon Sep 17 00:00:00 2001 From: Erkin Batu Altunbaş Date: Tue, 24 Jul 2012 17:53:51 +0300 Subject: Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ec1f3b0..603b16f 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ The package is in the official repositories as `community/ponysay`. There is a package for Gentoo, to make installation and keeping it up to date easy. You can find it in [this overlay](/etu/aidstu-overlay). The package is named `games-misc/ponysay`. #### Debian/Ubuntu -The DEB file can be found [here](http://roryholland.co.uk/misc.html#ponysay). +The DEB file can be found [here](http://roryholland.co.uk/misc.html#ponysay) and the PPA can be found [here](https://launchpad.net/~blazemore/+archive/ponysay). ### Pony fortune on terminal startup -- cgit From 15daf9a399886b78b9173f1c89ea8b64b500e481 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 24 Jul 2012 18:42:44 +0300 Subject: Full name for Debian GNU/Linux and ’and’ instead of ’/’ between that and Ubuntu. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 603b16f..68d6a54 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ The package is in the official repositories as `community/ponysay`. #### Gentoo Linux There is a package for Gentoo, to make installation and keeping it up to date easy. You can find it in [this overlay](/etu/aidstu-overlay). The package is named `games-misc/ponysay`. -#### Debian/Ubuntu +#### Debian GNU/Linux and Ubuntu The DEB file can be found [here](http://roryholland.co.uk/misc.html#ponysay) and the PPA can be found [here](https://launchpad.net/~blazemore/+archive/ponysay). ### Pony fortune on terminal startup -- cgit From 7f5fc135cf005a3275e6a648f4f665429193e122 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 24 Jul 2012 18:03:57 +0200 Subject: fix for ponyquotes in tty --- ponysay | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ponysay b/ponysay index 1afb742..b5d823c 100755 --- a/ponysay +++ b/ponysay @@ -146,7 +146,7 @@ say() { # Ponies use UTF-8 drawing characters. Prevent a Perl warning. export PERL_UNICODE=S - if [ "$TERM" = "linux" ]; then + if [ "$TERM" = "linux" ] || [ "$TERM" = "-linux-" ]; then echo -ne '\e[H\e[2J' fi @@ -244,6 +244,7 @@ if [[ $usepq = 1 ]]; then /usr/bin/pq4ps $@ } fi + [[ "$TERM" = "-linux-" ]] && TERM="linux" $0 ${wrap:+-W$wrap} $(q "$*") exit fi -- cgit From cdf9d2cb0129b92a28c5f9ac51f906395e5e74ea Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 24 Jul 2012 18:33:37 +0200 Subject: adding submodule --- .gitmodules | 3 +++ ponyquotes4ponysay | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 ponyquotes4ponysay diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..1560352 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "ponyquotes4ponysay"] + path = ponyquotes4ponysay + url = git://github.com/maandree/ponyquotes4ponysay.git diff --git a/ponyquotes4ponysay b/ponyquotes4ponysay new file mode 160000 index 0000000..8147d45 --- /dev/null +++ b/ponyquotes4ponysay @@ -0,0 +1 @@ +Subproject commit 8147d45117b25ae584a789af5630bdf1ff62ef7a -- cgit From 9520fe8c09a4c9ab59b7c2e0841b8ffd999a27f3 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 24 Jul 2012 18:35:49 +0200 Subject: removing a screenshot --- customcowsay.png | Bin 32514 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 customcowsay.png diff --git a/customcowsay.png b/customcowsay.png deleted file mode 100644 index b093c1b..0000000 Binary files a/customcowsay.png and /dev/null differ -- cgit From 71a87529a5f753ce55dbf5cf416f5067e20cd71b Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 24 Jul 2012 18:50:19 +0200 Subject: Edit Makefile for submodule ponyquotes --- Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4feb3fc..114198e 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -all: ponysaytruncater manpages infomanual ponythinkcompletion +all: ponysaytruncater manpages infomanual ponythinkcompletion submodules ponysaytruncater: gcc -o "ponysaytruncater" "ponysaytruncater.c" @@ -16,6 +16,9 @@ ponythinkcompletion: sed -e 's/ponysay/ponythink/g' <"completion/fish-completion.fish" | sed -e 's/\/ponythink\//\/ponysay\//g' -e 's/\\\/ponythink\\\//\\\/ponysay\\\//g' >"completion/fish-completion-think.fish" sed -e 's/ponysay/ponythink/g' <"completion/zsh-completion.zsh" | sed -e 's/\/ponythink\//\/ponysay\//g' -e 's/\\\/ponythink\\\//\\\/ponysay\\\//g' >"completion/zsh-completion-think.zsh" +submodules: + (cd "ponyquotes4ponysay/"; make -B) + ttyponies: mkdir -p ttyponies for pony in $$(ls --color=no ponies/); do \ @@ -85,6 +88,8 @@ install: all install-info --dir-file="$(DESTDIR)/usr/share/info/dir" --entry="Miscellaneous" --description="My Little Ponies for your terminal" "$(DESTDIR)/usr/share/info/ponysay.info.gz" install-info --dir-file="$(DESTDIR)/usr/share/info/dir" --entry="Miscellaneous" --description="My Little Ponies for your terminal" "$(DESTDIR)/usr/share/info/ponythink.info.gz" + (cd "ponyquotes4ponysay/"; make DESTDIR="$(DESTDIR)" install) + @echo -e '\n\n'\ '/--------------------------------------------------\\\n'\ '| ___ |\n'\ @@ -124,6 +129,7 @@ uninstall: unlink "$(DESTDIR)/usr/share/man/es/man6/ponythink.6.gz" unlink "$(DESTDIR)/usr/share/info/ponysay.info.gz" unlink "$(DESTDIR)/usr/share/info/ponythink.info.gz" + (cd "ponyquotes4ponysay/"; make DESTDIR="$(DESTDIR)" uninstall) clean: rm -f "ponysaytruncater" @@ -133,3 +139,4 @@ clean: rm -f "manuals/manpage.6.gz" rm -f "manuals/manpage.es.6.gz" rm -f "ponysay.info.gz" + (cd "ponyquotes4ponysay/"; make clean) -- cgit From 2ecc64cb70bef93e522924460e9debf3127cbfa6 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 24 Jul 2012 19:00:23 +0200 Subject: Makefile updates submodules --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 114198e..32be888 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,7 @@ ponythinkcompletion: sed -e 's/ponysay/ponythink/g' <"completion/zsh-completion.zsh" | sed -e 's/\/ponythink\//\/ponysay\//g' -e 's/\\\/ponythink\\\//\\\/ponysay\\\//g' >"completion/zsh-completion-think.zsh" submodules: + git submodule update (cd "ponyquotes4ponysay/"; make -B) ttyponies: -- cgit