Merge pull request #85 from kobotoolbox/update-or-upgrade

Accept either `--update` or `--upgrade`…
kobotoolbox · Apr 30, 2020 · d5836ff · d5836ff
2 parents 2aea483 + f6b6187
commit d5836ff
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/helpers/command.py b/helpers/command.py
@@ -33,8 +33,8 @@ def help():
                "                Prompt questions to rebuild configuration. Restart KoBoToolbox\n"
                "          -S, --stop\n"
                "                Stop KoBoToolbox\n"
-               "          -u, --upgrade\n"
-               "                Upgrade KoBoToolbox\n"
+               "          -u, --update, --upgrade\n"
+               "                Update KoBoToolbox\n"
                "          -cf, --compose-frontend [docker-compose arguments]\n"
                "                Run a docker-compose command in the front-end environment\n"
                "          -cb, --compose-backend [docker-compose arguments]\n"

diff --git a/run.py b/run.py
@@ -55,7 +55,11 @@ def run(force_setup=False):
     elif len(sys.argv) == 2:
         if sys.argv[1] == "-h" or sys.argv[1] == "--help":
             Command.help()
-        elif sys.argv[1] == "-u" or sys.argv[1] == "--upgrade":
+        elif sys.argv[1] == "-u" or sys.argv[1] == "--update":
+            # Gets changed to "update" in a future release; accept either
+            # "update" or "upgrade" here to ease the transition
+            Command.upgrade()
+        elif sys.argv[1] == "--upgrade":
             Command.upgrade()
         elif sys.argv[1] == "-i" or sys.argv[1] == "--info":
             Command.info(0)