Update output of console scripts info

Author: mdmintz

seleniumbase/console_scripts/run.py

@@ -66,10 +66,10 @@ def show_basic_usage():
     sc += ("\n")
     sc += ("COMMANDS:\n")
     sc += ("      install         [DRIVER] [OPTIONS]\n")
+    sc += ("      options         (List common pytest options)\n")
     sc += ("      mkdir           [DIRECTORY] [OPTIONS]\n")
     sc += ("      mkfile          [FILE.py] [OPTIONS]\n")
-    sc += ("      mkpres          [FILE.py] [LANGUAGE OPTIONS]\n")
-    sc += ("      options         (List common pytest options)\n")
+    sc += ("      mkpres          [FILE.py] [LANG]\n")
     sc += ("      print           [FILE] [OPTIONS]\n")
     sc += ("      translate       [SB_FILE.py] [LANG] [ACTION]\n")
     sc += ("      convert         [WEBDRIVER_UNITTEST_FILE.py]\n")
@@ -79,7 +79,7 @@ def show_basic_usage():
     sc += ("      revert-objects  [SB_FILE.py] [OPTIONS]\n")
     sc += ("      encrypt         (OR: obfuscate)\n")
     sc += ("      decrypt         (OR: unobfuscate)\n")
-    sc += ("      download server (Selenium Server JAR file)\n")
+    sc += ("      download server (The Selenium Grid JAR file)\n")
     sc += ("      grid-hub        [start|stop] [OPTIONS]\n")
     sc += ("      grid-node       [start|stop] --hub=[HOST/IP]\n")
     sc += (' * (EXAMPLE: "sbase install chromedriver latest")  *\n')
@@ -193,10 +193,10 @@ def show_mkpres_usage():
     print(sc)
     print("")
     print("  Usage:")
-    print("           seleniumbase mkpres [FILE.py] [LANGUAGE OPTIONS]")
-    print("           OR:    sbase mkpres [FILE.py] [LANGUAGE OPTIONS]")
+    print("           seleniumbase mkpres [FILE.py] [LANG]")
+    print("           OR:    sbase mkpres [FILE.py] [LANG]")
     print("  Example:")
-    print("           sbase mkpres new_presentation.py")
+    print("           sbase mkpres new_presentation.py --en")
     print("  Language Options:")
     print("          --en / --English    |    --zh / --Chinese")
     print("          --nl / --Dutch      |    --fr / --French")
@@ -257,8 +257,8 @@ def show_translate_usage():
     print(sc)
     print("")
     print("  Usage:")
-    print("         seleniumbase translate [SB_FILE.py] [LANGUAGE] [ACTION]")
-    print("         OR:    sbase translate [SB_FILE.py] [LANGUAGE] [ACTION]")
+    print("         seleniumbase translate [SB_FILE.py] [LANG] [ACTION]")
+    print("         OR:    sbase translate [SB_FILE.py] [LANG] [ACTION]")
     print("  Languages:")
     print("         --en / --English    |    --zh / --Chinese")
     print("         --nl / --Dutch      |    --fr / --French")
@@ -309,8 +309,8 @@ def show_inject_objects_usage():
     print(sc)
     print("")
     print("  Usage:")
-    print("           seleniumbase inject-objects [SB_FILE.py]")
-    print("           OR:    sbase inject-objects [SB_FILE.py]")
+    print("           seleniumbase inject-objects [SB_FILE.py] [OPTIONS]")
+    print("           OR:    sbase inject-objects [SB_FILE.py] [OPTIONS]")
     print("  Options:")
     print("           -c, --comments  (Add object selectors to the comments.)")
     print("                           (Default: No added comments.)")
@@ -329,8 +329,8 @@ def show_objectify_usage():
     print(sc)
     print("")
     print("  Usage:")
-    print("           seleniumbase objectify [SB_FILE.py]")
-    print("           OR:    sbase objectify [SB_FILE.py]")
+    print("           seleniumbase objectify [SB_FILE.py] [OPTIONS]")
+    print("           OR:    sbase objectify [SB_FILE.py] [OPTIONS]")
     print("  Options:")
     print("           -c, --comments  (Add object selectors to the comments.)")
     print("                           (Default: No added comments.)")
@@ -352,8 +352,8 @@ def show_revert_objects_usage():
     print(sc)
     print("")
     print("  Usage:")
-    print("           seleniumbase revert-objects [SB_FILE.py]")
-    print("           OR:    sbase revert-objects [SB_FILE.py]")
+    print("           seleniumbase revert-objects [SB_FILE.py] [OPTIONS]")
+    print("           OR:    sbase revert-objects [SB_FILE.py] [OPTIONS]")
     print("  Options:")
     print("           -c, --comments  (Keep existing comments for the lines.)")
     print("                           (Default: No comments are kept.)")

seleniumbase/console_scripts/sb_mkpres.py

@@ -3,11 +3,11 @@
 Creates a new SeleniumBase presentation with boilerplate code.
 
 Usage:
-    seleniumbase mkpres [FILE.py] [LANGUAGE OPTIONS]
-    or     sbase mkpres [FILE.py] [LANGUAGE OPTIONS]
+    seleniumbase mkpres [FILE.py] [LANG]
+    or     sbase mkpres [FILE.py] [LANG]
 
 Example:
-    sbase mkpres new_presentation.py
+    sbase mkpres new_presentation.py --en
 
 Language Options:
     --en / --English    |    --zh / --Chinese
@@ -33,10 +33,10 @@
 def invalid_run_command(msg=None):
     exp = ("  ** mkpres **\n\n")
     exp += "  Usage:\n"
-    exp += "          seleniumbase mkpres [FILE.py] [LANGUAGE OPTIONS]\n"
-    exp += "          OR     sbase mkpres [FILE.py] [LANGUAGE OPTIONS]\n"
+    exp += "          seleniumbase mkpres [FILE.py] [LANG]\n"
+    exp += "          OR     sbase mkpres [FILE.py] [LANG]\n"
     exp += "  Example:\n"
-    exp += "          sbase mkpres new_presentation.py\n"
+    exp += "          sbase mkpres new_presentation.py --en\n"
     exp += "  Language Options:\n"
     exp += "          --en / --English    |    --zh / --Chinese\n"
     exp += "          --nl / --Dutch      |    --fr / --French\n"