fixes, will release soon

Kwpolska · Aug 14, 2012 · c905e00 · c905e00
1 parent 3f38d0a
commit c905e00
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 28 deletions.
diff --git a/docs/pkgbuilder.rst b/docs/pkgbuilder.rst
@@ -12,7 +12,7 @@ PKGBUILDer
 SYNOPSIS
 ========
 
-*pkgbuilder* <operation> [options] [targets]
+*pkgbuilder* [-hvCDVwSy] [-p PROTOCOL] [-isu] [PACKAGE [PACKAGE ...]]
 
 DESCRIPTION
 ===========
@@ -29,10 +29,10 @@ OPERATIONS
 ==========
 
 **-i, --info**
-    Displays info about **targets** in a fashion similar to pacman.
+    Displays info about **PACKAGE** in a fashion similar to pacman.
 
 **-s, --search**
-    Searches the AUR for packages with **targets** as the query.
+    Searches the AUR for packages with **PACKAGE** as the query.
 
 **-u, --sysupgrade**
     Checks for package updates in the AUR.  If updates are found,
@@ -49,15 +49,28 @@ OPTIONS
 **-C, --nocolor**
     Forces the script to ignore the ANSI color codes.
 
+**-D, --nodepcheck**
+    Skips dependency checks.  It may (and, most likely, will)
+    break makepkg.
+
 **-V, --novalidation**
     Skips package installation validation phase (checking
     if the package is installed).
 
+**-w, --buildonly**
+    Skips package installation after building.
+
+**-p PROTOCOL, --protocol PROTOCOL**
+    Chooses the protocol, http by default.
+
 **-S, --sync**
     Originally for pacman syntax compatibility, now makes the script more
     wrapper-friendly: builds packages in */tmp* and uses *aur* instead of
     the category in search.
 
+**-y, --refresh**
+    A dummy option for pacman syntax compatibility.
+
 EXAMPLES
 ========
 
@@ -75,7 +88,7 @@ pkgbuilder -Syu
 
 SEE ALSO
 ========
-**pacman(8)**, **makepkg(8)**
+**pacman(8)**, **makepkg(8)**, **PKGBUILD(5)**
 
 You can visit the git repo at <https://github.com/Kwpolska/pkgbuilder>
 for more info.

diff --git a/pkgbuilder/__init__.py b/pkgbuilder/__init__.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 # -*- encoding: utf-8 -*-
 # PKGBUILDer v2.1.3.4
-# An AUR helper/library.
+# An AUR helper (and library) in Python 3.
 # Copyright (C) 2011-2012, Kwpolska.
 # All rights reserved.
 #
@@ -37,7 +37,7 @@
     pkgbuilder
     ~~~~~~~~~~
 
-    An AUR helper/library.
+    An AUR helper (and library) in Python 3.
 
     :Copyright: (C) 2011-2012, Kwpolska.
     :License: BSD (see /LICENSE).

diff --git a/pkgbuilder/aur.py b/pkgbuilder/aur.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 # -*- encoding: utf-8 -*-
 # PKGBUILDer v2.1.3.4
-# An AUR helper/library.
+# An AUR helper (and library) in Python 3.
 # Copyright (C) 2011-2012, Kwpolska.
 # See /LICENSE for licensing information.
 

diff --git a/pkgbuilder/build.py b/pkgbuilder/build.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 # -*- encoding: utf-8 -*-
 # PKGBUILDer v2.1.3.4
-# An AUR helper/library.
+# An AUR helper (and library) in Python 3.
 # Copyright (C) 2011-2012, Kwpolska.
 # See /LICENSE for licensing information.
 

diff --git a/pkgbuilder/main.py b/pkgbuilder/main.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 # -*- encoding: utf-8 -*-
 # PKGBUILDer v2.1.3.4
-# An AUR helper/library.
+# An AUR helper (and library) in Python 3.
 # Copyright (C) 2011-2012, Kwpolska.
 # See /LICENSE for licensing information.
 
@@ -29,34 +29,35 @@ def main():
     """Main routine of PKGBUILDer."""
     try:
         DS.log.info('Running argparse.')
-        parser = argparse.ArgumentParser(description=_('An AUR helper/library.\
-  Wrapper-friendly (pacman-like output.)'), epilog=_('You can \
-use pacman syntax if you want to.'))
+        parser = argparse.ArgumentParser(description=_('An AUR helper \
+        (and library) in Python 3.'))
 
         parser.add_argument('-v', '--version', action='version',
                             version='PKGBUILDer v' + __version__)
         parser.add_argument('pkgs', metavar='PACKAGE', action='store',
                             nargs='*', help=_('packages to build'))
 
-        argopt = parser.add_argument_group('options')
-        argopr = parser.add_argument_group('operations')
+        argopt = parser.add_argument_group(_('options'))
+        argopr = parser.add_argument_group(_('operations'))
+        argsyn = parser.add_argument_group(_('pacman compatibility'))
+
         argopt.add_argument('-C', '--nocolor', action='store_false',
                             default=True, dest='color', help=_('don\'t use \
                             colors in output'))
         argopt.add_argument('-D', '--nodepcheck', action='store_false',
                             default=True, dest='depcheck', help=_('don\'t \
                             check dependencies (may break makepkg)'))
-        argopt.add_argument('-w', '--buildonly', action='store_false',
-                            default=True, dest='mkpginst', help=_('don\'t \
-                            install packages after building'))
         argopt.add_argument('-V', '--novalidation', action='store_false',
                             default=True, dest='valid', help=_('don\'t check \
                             if packages were installed after build'))
-        argopt.add_argument('-S', '--sync', action='store_true', default=False,
-                            dest='pac', help=_('pacman syntax compatiblity'))
-        argopt.add_argument('-y', '--refresh', action='store_true',
-                            default=False, dest='pacupd', help=_('pacman \
-                            syntax compatiblity'))
+        argopt.add_argument('-w', '--buildonly', action='store_false',
+                            default=True, dest='mkpginst', help=_('don\'t \
+                            install packages after building'))
+        argopt.add_argument('-p', '--protocol', action='store',
+                            default='http', dest='protocol',
+                            metavar=_('PROTOCOL'), help=_('chooses \
+                            protocol (default: http)'))
+
         argopr.add_argument('-i', '--info', action='store_true', default=False,
                             dest='info', help=_('view package information'))
         argopr.add_argument('-s', '--search', action='store_true',
@@ -65,9 +66,12 @@ def main():
         argopr.add_argument('-u', '--sysupgrade', action='store_true',
                             default=False, dest='upgrade',
                             help=_('upgrade installed AUR packages'))
-        argopr.add_argument('-p', '--protocol', action='store',
-                            default='http', dest='protocol',
-                            help=_('chooses protocol (default: http)'))
+
+        argsyn.add_argument('-S', '--sync', action='store_true', default=False,
+                            dest='pac', help=_('pacman-like mode \
+                            (/tmp/ build, aur/ in -s)'))
+        argsyn.add_argument('-y', '--refresh', action='store_true',
+                            default=False, dest='pacupd', help=_('(dummy)'))
 
         args = parser.parse_args()
         DS.validate = args.valid

diff --git a/pkgbuilder/pbds.py b/pkgbuilder/pbds.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 # -*- encoding: utf-8 -*-
 # PKGBUILDer v2.1.3.4
-# An AUR helper/library.
+# An AUR helper (and library) in Python 3.
 # Copyright (C) 2011-2012, Kwpolska.
 # See /LICENSE for licensing information.
 

diff --git a/pkgbuilder/upgrade.py b/pkgbuilder/upgrade.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 # -*- encoding: utf-8 -*-
 # PKGBUILDer v2.1.3.4
-# An AUR helper/library.
+# An AUR helper (and library) in Python 3.
 # Copyright (C) 2011-2012, Kwpolska.
 # See /LICENSE for licensing information.
 

diff --git a/pkgbuilder/utils.py b/pkgbuilder/utils.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 # -*- encoding: utf-8 -*-
 # PKGBUILDer v2.1.3.4
-# An AUR helper/library.
+# An AUR helper (and library) in Python 3.
 # Copyright (C) 2011-2012, Kwpolska.
 # See /LICENSE for licensing information.