trim excess whitespace

This commit is contained in:
a1346054 2021-09-13 13:28:10 +00:00
parent 2199a6c1d0
commit ea715c6934
8 changed files with 47 additions and 50 deletions

View File

@ -8,15 +8,15 @@ searched, repacked and compared with patool. The advantage of patool is
its simplicity in handling archive files without having to remember a its simplicity in handling archive files without having to remember a
myriad of programs and options. myriad of programs and options.
The archive format is determined by the file(1) program and as The archive format is determined by the file(1) program and as
a fallback by the archive file extension. a fallback by the archive file extension.
patool supports 7z (.7z, .cb7), ACE (.ace, .cba), ADF (.adf), ALZIP (.alz), patool supports 7z (.7z, .cb7), ACE (.ace, .cba), ADF (.adf), ALZIP (.alz),
APE (.ape), AR (.a), ARC (.arc), ARJ (.arj), BZIP2 (.bz2), APE (.ape), AR (.a), ARC (.arc), ARJ (.arj), BZIP2 (.bz2),
CAB (.cab), COMPRESS (.Z), CPIO (.cpio), DEB (.deb), DMS (.dms), CAB (.cab), COMPRESS (.Z), CPIO (.cpio), DEB (.deb), DMS (.dms),
FLAC (.flac), GZIP (.gz), ISO (.iso), LRZIP (.lrz), LZH (.lha, .lzh), FLAC (.flac), GZIP (.gz), ISO (.iso), LRZIP (.lrz), LZH (.lha, .lzh),
LZIP (.lz), LZMA (.lzma), LZOP (.lzo), RPM (.rpm), RAR (.rar, .cbr), LZIP (.lz), LZMA (.lzma), LZOP (.lzo), RPM (.rpm), RAR (.rar, .cbr),
RZIP (.rz), SHN (.shn), TAR (.tar, .cbt), XZ (.xz), RZIP (.rz), SHN (.shn), TAR (.tar, .cbt), XZ (.xz),
ZIP (.zip, .jar, .cbz) and ZOO (.zoo) archive formats. ZIP (.zip, .jar, .cbz) and ZOO (.zoo) archive formats.
It relies on helper applications to handle those archive formats It relies on helper applications to handle those archive formats
(for example bzip2 for BZIP2 archives). (for example bzip2 for BZIP2 archives).

View File

@ -33,23 +33,23 @@ General rules for all convenience functions:
The convenience functions are: The convenience functions are:
* ``def extract_archive(archive, verbosity=0, outdir=None, program=None)`` * ``def extract_archive(archive, verbosity=0, outdir=None, program=None)``
Extracts the given archive filename to the current working directory Extracts the given archive filename to the current working directory
or if specified to the given directory name in outdir. or if specified to the given directory name in outdir.
Checks that the archive exists and is readable before extracting it. Checks that the archive exists and is readable before extracting it.
* ``def list_archive(archive, verbosity=1, program=None)`` * ``def list_archive(archive, verbosity=1, program=None)``
Lists the contents of the given archive filename on stdout. Lists the contents of the given archive filename on stdout.
Checks that the archive exists and is readable before listing it. Checks that the archive exists and is readable before listing it.
* ``def test_archive(archive, verbosity=0, program=None)`` * ``def test_archive(archive, verbosity=0, program=None)``
Tests the given archive filename. Tests the given archive filename.
Checks that the archive exists and is readable before testing it. Checks that the archive exists and is readable before testing it.
* ``def create_archive(archive, filenames, verbosity=0, program=None)`` * ``def create_archive(archive, filenames, verbosity=0, program=None)``
Creates a new archive. The type of archive is determined Creates a new archive. The type of archive is determined
by the archive filename extension. by the archive filename extension.
Checks that the archive is not already existing to avoid overwriting it. Checks that the archive is not already existing to avoid overwriting it.
@ -57,7 +57,7 @@ The convenience functions are:
and are readable. and are readable.
* ``diff_archives(archive1, archive2, verbosity=0)`` * ``diff_archives(archive1, archive2, verbosity=0)``
This function lists differences in the content of the two archives. This function lists differences in the content of the two archives.
Both archives are extracted and the contents are compared Both archives are extracted and the contents are compared
recursively with the diff(1) program. recursively with the diff(1) program.
@ -70,7 +70,7 @@ The convenience functions are:
Checks that archive exists and is readable. Checks that archive exists and is readable.
* ``repack_archive (archive, archive_new, verbosity=0)`` * ``repack_archive (archive, archive_new, verbosity=0)``
This function extracts the contents of the archive and packs them This function extracts the contents of the archive and packs them
into archive_new. into archive_new.
Checks that archive exists and is readable. Also checks that Checks that archive exists and is readable. Also checks that

View File

@ -4,7 +4,7 @@ Installation
First, install the required software. First, install the required software.
1. Python >= 2.7 from https://www.python.org/ 1. Python >= 2.7 from https://www.python.org/
Now install the application. Now install the application.
@ -15,20 +15,20 @@ Now install the application.
2. Installation from source 2. Installation from source
a) Installation as root a) Installation as root
Run ``sudo python setup.py install`` to install patool. Run ``sudo python setup.py install`` to install patool.
b) Installation as a normal user b) Installation as a normal user
Run ``python setup.py install --home $HOME``. Note that you have Run ``python setup.py install --home $HOME``. Note that you have
to adjust your PATH and PYTHONPATH environment variables, e.g. by to adjust your PATH and PYTHONPATH environment variables, e.g. by
adding the commands ``export PYTHONPATH=$HOME/lib/python`` and adding the commands ``export PYTHONPATH=$HOME/lib/python`` and
``export PATH=$PATH:$HOME/bin`` to your shell configuration ``export PATH=$PATH:$HOME/bin`` to your shell configuration
file. file.
For more information look at the `Modifying Python's search path`_ For more information look at the `Modifying Python's search path`_
documentation. documentation.
.. _Modifying Python's search path: .. _Modifying Python's search path:
http://docs.python.org/inst/search-path.html#SECTION000410000000000000000 http://docs.python.org/inst/search-path.html#SECTION000410000000000000000

View File

@ -7,8 +7,8 @@ b, u, i, center,
dl, dt, dd, ol, ul, li, dl, dt, dd, ol, ul, li,
fieldset, form, label, legend, fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td, table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, embed, article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup, figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary, menu, nav, output, ruby, section, summary,
time, mark, audio, video { time, mark, audio, video {
margin: 0; margin: 0;
@ -19,7 +19,7 @@ time, mark, audio, video {
vertical-align: baseline; vertical-align: baseline;
} }
/* HTML5 display-role reset for older browsers */ /* HTML5 display-role reset for older browsers */
article, aside, details, figcaption, figure, article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section { footer, header, hgroup, menu, nav, section {
display: block; display: block;
} }
@ -43,7 +43,7 @@ table {
} }
body { body {
font-size: 13px; font-size: 13px;
line-height: 1.5; line-height: 1.5;
font-family: 'Helvetica Neue', Helvetica, Arial, serif; font-family: 'Helvetica Neue', Helvetica, Arial, serif;
color: #000; color: #000;
} }
@ -118,14 +118,14 @@ th {
td { td {
border: 1px solid #ebebeb; border: 1px solid #ebebeb;
text-align: center; text-align: center;
font-weight: 300; font-weight: 300;
} }
form { form {
background: #f2f2f2; background: #f2f2f2;
padding: 20px; padding: 20px;
} }
@ -133,43 +133,43 @@ form {
h1 { h1 {
font-size: 2.8em; font-size: 2.8em;
} }
h2 { h2 {
font-size: 22px; font-size: 22px;
font-weight: bold; font-weight: bold;
color: #303030; color: #303030;
margin-bottom: 8px; margin-bottom: 8px;
} }
h3 { h3 {
color: #d5000d; color: #d5000d;
font-size: 18px; font-size: 18px;
font-weight: bold; font-weight: bold;
margin-bottom: 8px; margin-bottom: 8px;
} }
h4 { h4 {
font-size: 16px; font-size: 16px;
color: #303030; color: #303030;
font-weight: bold; font-weight: bold;
} }
h5 { h5 {
font-size: 1em; font-size: 1em;
color: #303030; color: #303030;
} }
h6 { h6 {
font-size: .8em; font-size: .8em;
color: #303030; color: #303030;
} }
p { p {
font-weight: 300; font-weight: 300;
margin-bottom: 20px; margin-bottom: 20px;
} }
a { a {
text-decoration: none; text-decoration: none;
} }
@ -223,4 +223,4 @@ footer a {
.clearfix {display: inline-block;} .clearfix {display: inline-block;}
* html .clearfix {height: 1%;} * html .clearfix {height: 1%;}
.clearfix {display: block;} .clearfix {display: block;}

View File

@ -1,4 +1,4 @@
/* http://meyerweb.com/eric/tools/css/reset/ /* http://meyerweb.com/eric/tools/css/reset/
v2.0 | 20110126 v2.0 | 20110126
License: none (public domain) License: none (public domain)
*/ */
@ -11,8 +11,8 @@ b, u, i, center,
dl, dt, dd, ol, ul, li, dl, dt, dd, ol, ul, li,
fieldset, form, label, legend, fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td, table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, embed, article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup, figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary, menu, nav, output, ruby, section, summary,
time, mark, audio, video { time, mark, audio, video {
margin: 0; margin: 0;
@ -23,7 +23,7 @@ time, mark, audio, video {
vertical-align: baseline; vertical-align: baseline;
} }
/* HTML5 display-role reset for older browsers */ /* HTML5 display-role reset for older browsers */
article, aside, details, figcaption, figure, article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section { footer, header, hgroup, menu, nav, section {
display: block; display: block;
} }
@ -49,7 +49,7 @@ table {
/* LAYOUT STYLES */ /* LAYOUT STYLES */
body { body {
font-size: 1em; font-size: 1em;
line-height: 1.5; line-height: 1.5;
background: #e7e7e7 url(../images/body-bg.png) 0 0 repeat; background: #e7e7e7 url(../images/body-bg.png) 0 0 repeat;
font-family: 'Helvetica Neue', Helvetica, Arial, serif; font-family: 'Helvetica Neue', Helvetica, Arial, serif;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); text-shadow: 0 1px 0 rgba(255, 255, 255, 0.8);
@ -227,14 +227,14 @@ th {
td { td {
border: 1px solid #ebebeb; border: 1px solid #ebebeb;
text-align: center; text-align: center;
font-weight: 300; font-weight: 300;
} }
form { form {
background: #f2f2f2; background: #f2f2f2;
padding: 20px; padding: 20px;
} }
@ -242,43 +242,43 @@ form {
h1 { h1 {
font-size: 32px; font-size: 32px;
} }
h2 { h2 {
font-size: 22px; font-size: 22px;
font-weight: bold; font-weight: bold;
color: #303030; color: #303030;
margin-bottom: 8px; margin-bottom: 8px;
} }
h3 { h3 {
color: #d5000d; color: #d5000d;
font-size: 18px; font-size: 18px;
font-weight: bold; font-weight: bold;
margin-bottom: 8px; margin-bottom: 8px;
} }
h4 { h4 {
font-size: 16px; font-size: 16px;
color: #303030; color: #303030;
font-weight: bold; font-weight: bold;
} }
h5 { h5 {
font-size: 1em; font-size: 1em;
color: #303030; color: #303030;
} }
h6 { h6 {
font-size: .8em; font-size: .8em;
color: #303030; color: #303030;
} }
p { p {
font-weight: 300; font-weight: 300;
margin-bottom: 20px; margin-bottom: 20px;
} }
a { a {
text-decoration: none; text-decoration: none;
} }

View File

@ -15,4 +15,3 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
"""Archive commands for the bsdcpio program.""" """Archive commands for the bsdcpio program."""
from .cpio import extract_cpio, list_cpio, test_cpio, create_cpio from .cpio import extract_cpio, list_cpio, test_cpio, create_cpio

View File

@ -15,4 +15,3 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
"""Archive commands for the lhasa program.""" """Archive commands for the lhasa program."""
from .lha import extract_lzh from .lha import extract_lzh

View File

@ -36,4 +36,3 @@ def create_zpaq(archive, compression, cmd, verbosity, interactive, filenames):
# zpaq has no separate test mode, so use listing instead # zpaq has no separate test mode, so use listing instead
test_zpaq = list_zpaq test_zpaq = list_zpaq