From a81a842f831138519bdcb4aa3f585f41c5926e94 Mon Sep 17 00:00:00 2001 From: Moritz Wilhelmy Date: Wed, 14 Mar 2012 00:56:10 +0100 Subject: minimise differences to manpage in master --- fb.1 | 79 ++++++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 42 insertions(+), 37 deletions(-) diff --git a/fb.1 b/fb.1 index 2607bf4..c2fd269 100644 --- a/fb.1 +++ b/fb.1 @@ -1,5 +1,5 @@ -.\" Copyright (c) 2010 Florian Pritz, flo at xssn.at -.\" 2011 Moritz Wilhelmy, mw at wzff.de +.\" Copyright (c) 2010-2012 Florian Pritz, flo at xssn.at +.\" 2011-2012 Moritz Wilhelmy, mw at wzff.de .\" .\" DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE .\" Version 2, December 2004 @@ -14,17 +14,19 @@ .\" .\" 0. You just DO WHAT THE FUCK YOU WANT TO. .\" -.Dd September 12, 2011 +.Dd March 14, 2012 .Dt FB 1 .Os .Sh NAME -.Nm fb +.Nm fb .Nd a shell-script client for http://paste.xinu.at .Sh SYNOPSIS .Nm +.Op options .Ar file/directory ... .Nm .Op Fl dg +.Op options .Ar ID/URL ... .Nm .Op Fl hv @@ -35,53 +37,54 @@ delete or download files. By default, files will be uploaded as-is and a link to the file will be printed to stdout after each upload. .Pp -Before terminating, -.Nm -will try to copy all links into the X clipboard if -.Xr xclip 1 -is installed. -Folders will be packed into a tarball with +Directories will be packed into a tarball with .Xr tar 1 and the resulting .Pa upload.tar file will be uploaded. If no arguments are given, data will be read from stdin into a temporary file -that will be uploaded as soon as EOF is received.. +that will be uploaded as soon as EOF is received. If the file being uploaded is bigger than 10MB .Nm will query the server for the maximum upload size and abort the upload if the file would be rejected. -.Pp -Following options are supported: +Before terminating, +.Nm +will try to copy all links into the X clipboard if +.Xr xclip 1 +is installed. +.Sh OPTIONS .Bl -tag -width Ds +.It Fl c +Compress the files to be uploaded using +.Xr gzip 1 . +This affects all files including piped content and directories. +If specified twice, +.Xr xz 1 +will be used rather than gzip. +If used in conjunction with the -g option this decompresses the download +before it's output to stdout. .It Fl d Delete the IDs. You can no longer upload files in this mode. If the argument is a URL, .Nm will try to extract the ID. +.It Fl e Ar extension +Change the extension used for highlighting. You can also do this if you +have already uploaded the file by appending the extension to the URL. +http://paste.xinu.at//bash will change the syntax highlighting to bash. .It Fl g Download the IDs and output on stdout. Please take care when using this, as binary data may cause unexpected results when being output directly to a terminal. You can no longer upload files in this mode. If the argument is a -URL, +URL, .Nm will try to extract the ID. .It Fl h Display a short help message. -.It Fl v -Display the client version. -.It Fl e Ar extension -Change the extension used for highlighting. You can also do this if you -have already uploaded the file by appending the extension to the URL. -http://paste.xinu.at//bash will change the syntax highlighting to bash. .It Fl t Upload a tar file containing all files and directories specified on the command line. -.It Fl c -Compress the files to be uploaded using -.Xr gzip 1 . -This affects all files including piped content and folders. -If specified twice, -.Xr xz 1 -will be used rather than gzip. +.It Fl v +Display the client version. .El .Pp If you want to be able to delete files, you have to add the following lines to @@ -94,27 +97,29 @@ machine paste.xinu.at .Sh ENVIRONMENT Some options can be changed by modifying environment variables: .Bl -tag -width XZ_OPTS -.It Ev GZIP +.It Ev GZIP Assigning GZIP will make the gzip-program treat it's value as if they had been appended to the command line. .It Ev XZ_OPTS The XZ_OPTS environment variable can be used in order to pass additional options to xz, in case xz is used for compression. .It TMPDIR -Setting TMPDIR to some directory where +Setting TMPDIR to some directory where .Nm create temporary files inside this directory rather than /tmp, if the -underlying mktemp program supports it. +underlying +.Xr mktemp 1 +program supports it. .Sh EXAMPLES .Bl -tag -.It Nm Fl tc Ar folder file -This will create a .tar archive containing the folder and the file and compress +.It Nm Fl tc Ar directory file +This will create a .tar archive containing the directory and the file and compress it using gzip and upload one archive. -.It Nm Fl c Ar folder file -This will create a .tar archive containing only the folder. Both (folder and +.It Nm Fl c Ar directory file +This will create a .tar archive containing only the directory. Both (directory and file) will be compressed using gzip and uploaded independently. -.It Nm Fl cc Ar folder -This will create a .tar archive containing only the folder and compress it using xz. +.It Nm Fl cc Ar directory +This will create a .tar archive containing only the directory and compress it using xz. .It Ic make \&|\&& Nm This will upload the output of make (stdout and stderr) in csh and similar shells. .El @@ -132,7 +137,7 @@ was written by .Bl -bullet -compact .It .\" mdoc has clever spam protection ;) -.An Florian Pritz Aq fl\&o@xssn.at +.An Florian Pritz Aq bluewi\&nd@xinu.at .It .An Moritz Wilhelmy Aq mor\&itz@wzff.de .El -- cgit v1.2.3-24-g4f1b