From 404b144c796ac51c3ca03aa7a2a7de9468938a42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= Date: Wed, 4 Jul 2012 09:39:37 +0200 Subject: [PATCH 1/5] adding manpage from github.com/kragniz/debian --- Makefile | 3 +++ manpage.6 | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 manpage.6 diff --git a/Makefile b/Makefile index 3ae73146..fceafe5f 100644 --- a/Makefile +++ b/Makefile @@ -23,6 +23,9 @@ install: all mkdir -p "$(DESTDIR)/usr/share/licenses/ponysay/" install "COPYING" "$(DESTDIR)/usr/share/licenses/ponysay/COPYING" + mkdir -p "$(DESTDIR)/usr/share/man/man6" + install "manpage.6" "$(DESTDIR)/usr/share/man/man6/ponysay.6" + uninstall: rm -fr "$(DESTDIR)/usr/share/ponies" rm -fr "$(DESTDIR)/usr/share/ttyponies" diff --git a/manpage.6 b/manpage.6 new file mode 100644 index 00000000..0e598ac8 --- /dev/null +++ b/manpage.6 @@ -0,0 +1,57 @@ +.\" +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH PONYSAY SECTION "April 10, 2012" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +ponysay \- A cowsay wrapper with ponies +.SH SYNOPSIS +.B ponysay +.RI [ options ] [ message ] +.br +.SH DESCRIPTION +.PP +.\" TeX users may be more comfortable with the \fB\fP and +.\" \fI\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBponysay\fP displays an image of a pony saying some text provided by the user +in a terminal. It is a wrapper for \fIcowsay\fP. If run with no arguments, it +accepts standard input, word-wraps the message given at about 40 columns, and +prints the pony saying the given message on standard output. +.SH OPTIONS +A summary of options is included below. +.TP +.B \-h +Show summary of options. +.TP +.B \-v +Show version of program. +.TP +.B \-l +List ponyfiles +.TP +.B \-f [ name ] +Select a pony (Either a filename or a pony name) +.TP +.B \-W [ column ] +The screen column where the message should be wrapped +.SH SEE ALSO +.BR cowsay (6). +.br +.SH AUTHOR +ponysay was written by Erkin Batu Altunbaş . +.PP +This manual page was written by Louis Taylor , +for the Debian project (and may be used by others). From 413b5d581c3ac02edd4a4ae5c19257d84b0a4309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= Date: Wed, 4 Jul 2012 09:45:18 +0200 Subject: [PATCH 2/5] moving manpage to section 1 (consitent with cowsay) --- Makefile | 5 +++-- manpage.6 => manpage.1 | 0 2 files changed, 3 insertions(+), 2 deletions(-) rename manpage.6 => manpage.1 (100%) diff --git a/Makefile b/Makefile index fceafe5f..467a0004 100644 --- a/Makefile +++ b/Makefile @@ -23,8 +23,8 @@ install: all mkdir -p "$(DESTDIR)/usr/share/licenses/ponysay/" install "COPYING" "$(DESTDIR)/usr/share/licenses/ponysay/COPYING" - mkdir -p "$(DESTDIR)/usr/share/man/man6" - install "manpage.6" "$(DESTDIR)/usr/share/man/man6/ponysay.6" + mkdir -p "$(DESTDIR)/usr/share/man/man1" + install "manpage.1" "$(DESTDIR)/usr/share/man/man1/ponysay.1" uninstall: rm -fr "$(DESTDIR)/usr/share/ponies" @@ -35,6 +35,7 @@ uninstall: unlink "$(DESTDIR)/usr/share/zsh/site-functions/_ponysay"; unlink "$(DESTDIR)/usr/share/licenses/ponysay/COPYING" unlink "$(DESTDIR)/usr/share/bash-completion/completions/ponysay" + unlink "$(DESTDIR)/usr/share/man/man1/ponysay.1" clean: rm -r "ponysaytruncater" diff --git a/manpage.6 b/manpage.1 similarity index 100% rename from manpage.6 rename to manpage.1 From 81b9e4f0b3e398d4fb7872b55b4fcb601f7902f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= Date: Wed, 4 Jul 2012 09:47:29 +0200 Subject: [PATCH 3/5] fixing 'se also' reference to cowsay in manpage (wrong section) --- manpage.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manpage.1 b/manpage.1 index 0e598ac8..b0d68ca6 100644 --- a/manpage.1 +++ b/manpage.1 @@ -48,7 +48,7 @@ Select a pony (Either a filename or a pony name) .B \-W [ column ] The screen column where the message should be wrapped .SH SEE ALSO -.BR cowsay (6). +.BR cowsay (1). .br .SH AUTHOR ponysay was written by Erkin Batu Altunbaş . From 46c3e0d74e25de74cfbb84fb2d6f04e7f6e318a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= Date: Wed, 4 Jul 2012 10:32:12 +0200 Subject: [PATCH 4/5] improving manpage + minor change in ponysay --help + sorting credits file --- CREDITS | 2 +- manpage.1 | 58 ++++++++++++++++++++++++++++++++++++++++++------------- ponysay | 14 ++++++++------ 3 files changed, 54 insertions(+), 20 deletions(-) diff --git a/CREDITS b/CREDITS index 93678558..79a42812 100644 --- a/CREDITS +++ b/CREDITS @@ -2,9 +2,9 @@ # Active developers Erkin Batu Altunbaş -Jan Alexander Steffens Mattias Andrée Sven-Hendrik Haase +Jan Alexander Steffens # Patchers and other contributors Duane Bekaert diff --git a/manpage.1 b/manpage.1 index b0d68ca6..92fbf50e 100644 --- a/manpage.1 +++ b/manpage.1 @@ -2,7 +2,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH PONYSAY SECTION "April 10, 2012" +.TH PONYSAY SECTION "July 4, 2012" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -19,17 +19,20 @@ ponysay \- A cowsay wrapper with ponies .SH SYNOPSIS .B ponysay -.RI [ options ] [ message ] +.RI [ options ] +.RI [ message ] .br .SH DESCRIPTION .PP .\" TeX users may be more comfortable with the \fB\fP and .\" \fI\fP escape sequences to invode bold face and italics, .\" respectively. -\fBponysay\fP displays an image of a pony saying some text provided by the user -in a terminal. It is a wrapper for \fIcowsay\fP. If run with no arguments, it -accepts standard input, word-wraps the message given at about 40 columns, and -prints the pony saying the given message on standard output. +\fBponysay\fP displays an image of a pony saying some text provided by the user in a terminal. +It is a wrapper for \fIcowsay\fP. If \fImessage\fP is not provided, it accepts standard input, +word-wraps the message given at about 40 columns, and prints the pony saying the given message on standard output. +.PP +If no arguments are provided, the program only accepts standard input piped from another program, a file or +either here documents or here strings (see man bash(1) for details on here document/string.) .SH OPTIONS A summary of options is included below. .TP @@ -40,18 +43,47 @@ Show summary of options. Show version of program. .TP .B \-l -List ponyfiles +List pony files. .TP -.B \-f [ name ] -Select a pony (Either a filename or a pony name) +.B \-f \fIname\fP +Select a pony (either a file name or a pony name.) .TP -.B \-W [ column ] +.B \-W \fIcolumn\fP The screen column where the message should be wrapped +.SH ENVIRONMENT +.TP +.B PONYSAY_BOTTOM +Under TTY (Linux VT), if the output is larger the the screen's height, only the beginning is +printed, leaving 2 blank lines. If you want the buttom to be printed rather the the beginning +you can export \fBPONYSAY_BOTTOM\fP with the value \fIyes\fP, \fIy\fP or \fI1\fP. +.SH BUG +Bugs can be reported in <\fBhttps://github.com/erkin/ponysay/issues\fP>. .SH SEE ALSO .BR cowsay (1). +.BR fortune (1). .br .SH AUTHOR -ponysay was written by Erkin Batu Altunbaş . +ponysay was written by Erkin Batu Altunbaş +with contributions from Mattias Andrée, Sven-Hendrik Haase, Jan Alexander Steffens &a. +.\" See file CREDITS for full list .PP -This manual page was written by Louis Taylor , -for the Debian project (and may be used by others). +This manual page was written by Louis Taylor +for the Debian project (and may be used by others), and edited +by Mattias Andrée . +.br +.SH COPYRIGHT +DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE +.br +Version 2, December 2004 +.PP +Copyright (C) 2012 Erkin Batu Altunbaş +.PP +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. diff --git a/ponysay b/ponysay index a04d8d73..4b5e912e 100755 --- a/ponysay +++ b/ponysay @@ -34,14 +34,16 @@ usage() { Usage: ${0##*/} [options] [message] -If [message] is not provided, reads the message from STDIN +If [message] is not provided, reads the message from STDIN. Options: - -v Show version and exit - -h Show this help and exit - -l List ponyfiles. - -f[name] Select a pony (Either a filename or a pony name) - -W[column] The screen column where the message should be wrapped + -v Show version and exit. + -h Show this help and exit. + -l List pony files. + -f[name] Select a pony (either a file name or a pony name.) + -W[column] The screen column where the message should be wrapped. + +See man ponysay(1) for more information. EOF } From 738dc690ebfd902f0168e47a7a875c5708b8ce18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= Date: Wed, 4 Jul 2012 11:27:06 +0200 Subject: [PATCH 5/5] m --- manpage.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manpage.1 b/manpage.1 index 92fbf50e..d5b8ec9c 100644 --- a/manpage.1 +++ b/manpage.1 @@ -59,7 +59,7 @@ you can export \fBPONYSAY_BOTTOM\fP with the value \fIyes\fP, \fIy\fP or \fI1\fP .SH BUG Bugs can be reported in <\fBhttps://github.com/erkin/ponysay/issues\fP>. .SH SEE ALSO -.BR cowsay (1). +.BR cowsay (1), .BR fortune (1). .br .SH AUTHOR