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

Fix conflict in makefile for spnish translation for manpages

Browse source
This commit is contained in:
Pablo Lezaeta 2012-07-12 23:52:06 -04:00
commit acec0f2d7a
3 changed files with 22 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Makefile
View file

@ -24,9 +24,9 @@ install: all
mkdir -p "$(DESTDIR)/usr/share/licenses/ponysay/" mkdir -p "$(DESTDIR)/usr/share/licenses/ponysay/"
install "COPYING" "$(DESTDIR)/usr/share/licenses/ponysay/COPYING" install "COPYING" "$(DESTDIR)/usr/share/licenses/ponysay/COPYING"
mkdir -p "$(DESTDIR)/usr/share/man/man1" mkdir -p "$(DESTDIR)/usr/share/man/man6"
install "manpage.1" "$(DESTDIR)/usr/share/man/man1/ponysay.1" install "manpage.6" "$(DESTDIR)/usr/share/man/man6/ponysay.6"
ln -sf "ponysay.1" "$(DESTDIR)/usr/share/man/man1/ponythink.1" ln -sf "ponysay.6" "$(DESTDIR)/usr/share/man/man6/ponythink.6"
mkdir -p "$(DESTDIR)/usr/share/man/es/man6" mkdir -p "$(DESTDIR)/usr/share/man/es/man6"
install "manpage.es.1" "$(DESTDIR)/usr/share/man/es/man6/ponysay.6" install "manpage.es.1" "$(DESTDIR)/usr/share/man/es/man6/ponysay.6"
@ -41,9 +41,11 @@ uninstall:
unlink "$(DESTDIR)/usr/share/zsh/site-functions/_ponysay"; unlink "$(DESTDIR)/usr/share/zsh/site-functions/_ponysay";
unlink "$(DESTDIR)/usr/share/licenses/ponysay/COPYING" unlink "$(DESTDIR)/usr/share/licenses/ponysay/COPYING"
unlink "$(DESTDIR)/usr/share/bash-completion/completions/ponysay" unlink "$(DESTDIR)/usr/share/bash-completion/completions/ponysay"
unlink "$(DESTDIR)/usr/share/man/man1/ponysay.1" unlink "$(DESTDIR)/usr/share/man/man6/ponysay.6"
unlink "$(DESTDIR)/usr/share/man/man1/ponythink.1" unlink "$(DESTDIR)/usr/share/man/man6/ponythink.6"
unlink "$(DESTDIR)/usr/share/man/es/man6/ponysay.6" unlink "$(DESTDIR)/usr/share/man/es/man6/ponysay.6"
unlink "$(DESTDIR)/usr/share/man/es/man6/ponythink.6" unlink "$(DESTDIR)/usr/share/man/es/man6/ponythink.6"
>>>>>>> upstream/master
clean: clean:
rm -r "ponysaytruncater" rm -f "ponysaytruncater"

25
manpage.1 → manpage.6
View file

@ -2,7 +2,7 @@
.\" First parameter, NAME, should be all caps .\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1) .\" other parameters are allowed: see man(7), man(1)
.TH PONYSAY SECTION "July 4, 2012" .TH PONYSAY 6 "July 12, 2012"
.\" Please adjust this date whenever revising the manpage. .\" Please adjust this date whenever revising the manpage.
.\" .\"
.\" Some roff macros, for reference: .\" Some roff macros, for reference:
@ -80,30 +80,17 @@ want to truncate the output on the height even if you are not running \fIponysay
Bugs can be reported in <\fBhttps://github.com/erkin/ponysay/issues\fP>. Bugs can be reported in <\fBhttps://github.com/erkin/ponysay/issues\fP>.
.SH SEE ALSO .SH SEE ALSO
.BR cowsay (1), .BR cowsay (1),
.BR fortune (1). .BR fortune (6).
.br .br
.SH AUTHOR .SH AUTHOR
ponysay was written by Erkin Batu Altunbaş <erkinbatu@gmail.com> ponysay was written by Erkin Batu Altunbaş <erkinbatu@gmail.com>
with contributions from Mattias Andrée, Sven-Hendrik Haase, Jan Alexander Steffens &a. with major contributions from Mattias Andrée, Sven-Hendrik Haase, Jan Alexander Steffens et al.
.\" See file CREDITS for full list .\" See file CREDITS for full list.
.PP .PP
This manual page was written by Louis Taylor <kragniz@gmail.com> This manual page was written by Louis Taylor <kragniz@gmail.com>
for the Debian project (and may be used by others), and edited for the Debian project (and may be used by others), and edited
by Mattias Andrée <maandree@kth.se>. by Mattias Andrée <maandree@kth.se>.
.br .br
.SH COPYRIGHT
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
.br
Version 2, December 2004
.PP .PP
Copyright (C) 2012 Erkin Batu Altunbaş This program is licensed under WTFPL.
.PP .\" See file COPYING to see the license.
Everyone is permitted to copy and distribute verbatim or modified
copies of this license document, and changing it is allowed as long
as the name is changed.
.PP
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
.br
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
.PP
0. You just DO WHAT THE FUCK YOU WANT TO.

16
ponysay
View file

@ -1,13 +1,13 @@
#!/usr/bin/env bash #!/usr/bin/env bash
version=0.9 version=0.10
SYSTEMPONIES=/usr/share/ponysay/ponies SYSTEMPONIES="/usr/share/ponysay/ponies"
HOMEPONIES="${HOME}/.ponysay/ponies" HOMEPONIES="${HOME}/.ponysay/ponies"
pony="*" pony="*"
wrap= wrap=""
if [ "$TERM" = "linux" ]; then if [ "$TERM" = "linux" ]; then
SYSTEMPONIES=/usr/share/ponysay/ttyponies SYSTEMPONIES="/usr/share/ponysay/ttyponies"
HOMEPONIES="${HOME}/.ponysay/ttyponies" HOMEPONIES="${HOME}/.ponysay/ttyponies"
fi fi
@ -43,7 +43,7 @@ Options:
-f[name] Select a pony (either a file name or a pony name.) -f[name] Select a pony (either a file name or a pony name.)
-W[column] The screen column where the message should be wrapped. -W[column] The screen column where the message should be wrapped.
See man ponysay(1) for more information. See man ponysay(6) for more information.
EOF EOF
} }
@ -66,7 +66,7 @@ say() {
if [ "$PONYSAY_FULL_WIDTH" = 'no' ] || [ "$PONYSAY_FULL_WIDTH" = 'n' ] || [ "$PONYSAY_FULL_WIDTH" = '0' ]; then if [ "$PONYSAY_FULL_WIDTH" = 'no' ] || [ "$PONYSAY_FULL_WIDTH" = 'n' ] || [ "$PONYSAY_FULL_WIDTH" = '0' ]; then
cat cat
else else
WIDTH=$((stty size <&2 || echo 0 0) | cut -d ' ' -f 2) WIDTH=`(stty size <&2 || echo 0 0) | cut -d ' ' -f 2`
ponysaytruncater $WIDTH 2>/dev/null || ponysaytruncater $WIDTH 2>/dev/null ||
${HOME}/.local/bin/ponysaytruncater $WIDTH 2>/dev/null || ${HOME}/.local/bin/ponysaytruncater $WIDTH 2>/dev/null ||
./ponysaytruncater $WIDTH 2>/dev/null || ./ponysaytruncater $WIDTH 2>/dev/null ||
@ -79,7 +79,7 @@ say() {
if [ "$PONYSAY_SHELL_LINES" = "" ]; then if [ "$PONYSAY_SHELL_LINES" = "" ]; then
PONYSAY_SHELL_LINES=2 PONYSAY_SHELL_LINES=2
fi fi
head --lines=$(( $(stty size <&2 | cut -d ' ' -f 1) - $PONYSAY_SHELL_LINES )) head --lines=$(( `stty size <&2 | cut -d ' ' -f 1` - $PONYSAY_SHELL_LINES ))
} }
if [ "$TERM" = "linux" ] || [ "$PONYSAY_TRUNCATE_HEIGHT" = 'yes' ] || [ "$PONYSAY_TRUNCATE_HEIGHT" = 'y' ] || [ "$PONYSAY_TRUNCATE_HEIGHT" = '1' ]; then if [ "$TERM" = "linux" ] || [ "$PONYSAY_TRUNCATE_HEIGHT" = 'yes' ] || [ "$PONYSAY_TRUNCATE_HEIGHT" = 'y' ] || [ "$PONYSAY_TRUNCATE_HEIGHT" = '1' ]; then
@ -106,7 +106,7 @@ do
done done
shift $((OPTIND - 1)) shift $((OPTIND - 1))
if ! hash $cmd &>/dev/null; then hash $cmd &>/dev/null; if [ $? -ne 0 ]; then
cat >&2 <<EOF cat >&2 <<EOF
You don't seem to have the $cmd program. You don't seem to have the $cmd program.
Please install it in order to use this wrapper. Please install it in order to use this wrapper.