X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=fdroid;h=ec9bae2cb7950405dde00e8950740e663459b889;hb=02203efe1582c90137209900dc30dbc55843bbaf;hp=045f2aacf8e5f133c61fff43c126d7bcb1add75b;hpb=fc0746712d86c1474889cf70a4bb999d53edc663;p=fdroidserver.git

diff --git a/fdroid b/fdroid
index 045f2aac..ec9bae2c 100755
--- a/fdroid
+++ b/fdroid
@@ -18,36 +18,46 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import sys
+import os
 import logging
 
 import fdroidserver.common
 import fdroidserver.metadata
+from fdroidserver import _
 from argparse import ArgumentError
-
-commands = {
-    "build": "Build a package from source",
-    "init": "Quickly start a new repository",
-    "publish": "Sign and place packages in the repo",
-    "gpgsign": "Add gpg signatures for packages in repo",
-    "update": "Update repo information for new packages",
-    "verify": "Verify the integrity of downloaded packages",
-    "checkupdates": "Check for updates to applications",
-    "import": "Add a new application from its source code",
-    "install": "Install built packages on devices",
-    "readmeta": "Read all the metadata files and exit",
-    "rewritemeta": "Rewrite all the metadata files",
-    "lint": "Warn about possible metadata errors",
-    "scanner": "Scan the source code of a package",
-    "stats": "Update the stats of the repo",
-    "server": "Interact with the repo HTTP server",
-    "signindex": "Sign indexes created using update --nosign",
-}
+from collections import OrderedDict
+
+
+commands = OrderedDict([
+    ("build", _("Build a package from source")),
+    ("init", _("Quickly start a new repository")),
+    ("publish", _("Sign and place packages in the repo")),
+    ("gpgsign", _("Add PGP signatures using GnuPG for packages in repo")),
+    ("update", _("Update repo information for new packages")),
+    ("deploy", _("Interact with the repo HTTP server")),
+    ("verify", _("Verify the integrity of downloaded packages")),
+    ("checkupdates", _("Check for updates to applications")),
+    ("import", _("Add a new application from its source code")),
+    ("install", _("Install built packages on devices")),
+    ("readmeta", _("Read all the metadata files and exit")),
+    ("rewritemeta", _("Rewrite all the metadata files")),
+    ("lint", _("Warn about possible metadata errors")),
+    ("scanner", _("Scan the source code of a package")),
+    ("dscanner", _("Dynamically scan APKs post build")),
+    ("stats", _("Update the stats of the repo")),
+    ("server", _("Old, deprecated name for fdroid deploy")),
+    ("signindex", _("Sign indexes created using update --nosign")),
+    ("btlog", _("Update the binary transparency log for a URL")),
+    ("signatures", _("Extract signatures from APKs")),
+    ("nightly", _("Set up an app build for a nightly build repo")),
+    ("mirror", _("Download complete mirrors of small repos")),
+])
 
 
 def print_help():
-    print("usage: fdroid [-h|--help|--version] <command> [<args>]")
+    print(_("usage: ") + _("fdroid [<command>] [-h|--help|--version|<args>]"))
     print("")
-    print("Valid commands are:")
+    print(_("Valid commands are:"))
     for cmd, summary in commands.items():
         print("   " + cmd + ' ' * (15 - len(cmd)) + summary)
     print("")
@@ -65,8 +75,7 @@ def main():
             print_help()
             sys.exit(0)
         elif command == '--version':
-            import os.path
-            output = 'no version info found!'
+            output = _('no version info found!')
             cmddir = os.path.realpath(os.path.dirname(__file__))
             moduledir = os.path.realpath(os.path.dirname(fdroidserver.common.__file__) + '/..')
             if cmddir == moduledir:
@@ -76,9 +85,11 @@ def main():
                     import subprocess
                     try:
                         output = subprocess.check_output(['git', 'describe'],
-                                                         stderr=subprocess.STDOUT)
+                                                         stderr=subprocess.STDOUT,
+                                                         universal_newlines=True)
                     except subprocess.CalledProcessError:
-                        output = 'git commit ' + subprocess.check_output(['git', 'rev-parse', 'HEAD'])
+                        output = 'git commit ' + subprocess.check_output(['git', 'rev-parse', 'HEAD'],
+                                                                         universal_newlines=True)
                 elif os.path.exists('setup.py'):
                     import re
                     m = re.search(r'''.*[\s,\(]+version\s*=\s*["']([0-9a-z.]+)["'].*''',
@@ -91,7 +102,7 @@ def main():
             print(output),
             sys.exit(0)
         else:
-            print("Command '%s' not recognised.\n" % command)
+            print(_("Command '%s' not recognised.\n" % command))
             print_help()
             sys.exit(1)
 
@@ -112,6 +123,11 @@ def main():
         logging.critical("Specifying --verbose and --quiet and the same time is silly")
         sys.exit(1)
 
+    # temporary workaround until server.py becomes deploy.py
+    if command == 'deploy':
+        command = 'server'
+        sys.argv.insert(1, 'update')
+
     # Trick optparse into displaying the right usage when --help is used.
     sys.argv[0] += ' ' + command
 
@@ -133,13 +149,16 @@ def main():
         sys.exit(1)
     except KeyboardInterrupt:
         print('')
-        sys.exit(1)
+        sys.stdout.flush()
+        sys.stderr.flush()
+        os._exit(1)
     # These should only be unexpected crashes due to bugs in the code
     # str(e) often doesn't contain a reason, so just show the backtrace
     except Exception as e:
-        logging.critical("Unknown exception found!")
+        logging.critical(_("Unknown exception found!"))
         raise
     sys.exit(0)
 
+
 if __name__ == "__main__":
     main()