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

diff --git a/fdroid b/fdroid
index f5e6c92b..ec9bae2c 100755
--- a/fdroid
+++ b/fdroid
@@ -18,6 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import sys
+import os
 import logging
 
 import fdroidserver.common
@@ -33,6 +34,7 @@ commands = OrderedDict([
     ("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")),
@@ -43,7 +45,7 @@ commands = OrderedDict([
     ("scanner", _("Scan the source code of a package")),
     ("dscanner", _("Dynamically scan APKs post build")),
     ("stats", _("Update the stats of the repo")),
-    ("server", _("Interact with the repo HTTP server")),
+    ("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")),
@@ -53,7 +55,7 @@ commands = OrderedDict([
 
 
 def print_help():
-    print(_("usage: ") + _("fdroid [-h|--help|--version] <command> [<args>]"))
+    print(_("usage: ") + _("fdroid [<command>] [-h|--help|--version|<args>]"))
     print("")
     print(_("Valid commands are:"))
     for cmd, summary in commands.items():
@@ -73,7 +75,6 @@ def main():
             print_help()
             sys.exit(0)
         elif command == '--version':
-            import os.path
             output = _('no version info found!')
             cmddir = os.path.realpath(os.path.dirname(__file__))
             moduledir = os.path.realpath(os.path.dirname(fdroidserver.common.__file__) + '/..')
@@ -122,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
 
@@ -143,7 +149,9 @@ 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: