rename 'app-id' to standard Android 'applicationId'

* https://developer.android.com/studio/build/application-id.html
* https://sites.google.com/a/android.com/tools/tech-docs/new-build-system/applicationid-vs-packagename

This only changes the term in the human texts, not var names or CLI flags.

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 273c7007d90d1e2b81e2b01ea030696b02e63934..889945d320720bd9776d2663fc392d2bf7769a2f 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -996,7 +996,7 @@ def parse_commandline():
 
     parser = ArgumentParser(usage="%(prog)s [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
     common.setup_global_opts(parser)
-    parser.add_argument("appid", nargs='*', help=_("app-id with optional versionCode in the form APPID[:VERCODE]"))
+    parser.add_argument("appid", nargs='*', help=_("applicationId with optional versionCode in the form APPID[:VERCODE]"))
     parser.add_argument("-l", "--latest", action="store_true", default=False,
                         help=_("Build only the latest version of each package"))
     parser.add_argument("-s", "--stop", action="store_true", default=False,

diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index 1897d0de9f6d529e04f2fd3deb367ff29d459ef1..7c269c1f366f849531e4c3b4bbd94555ec6ac19b 100644 (file)
--- a/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@ -510,7 +510,7 @@ def main():
     # Parse command line...
     parser = ArgumentParser(usage="%(prog)s [options] [APPID [APPID ...]]")
     common.setup_global_opts(parser)
-    parser.add_argument("appid", nargs='*', help=_("app-id to check for updates"))
+    parser.add_argument("appid", nargs='*', help=_("applicationId to check for updates"))
     parser.add_argument("--auto", action="store_true", default=False,
                         help=_("Process auto-updates"))
     parser.add_argument("--autoonly", action="store_true", default=False,

diff --git a/fdroidserver/dscanner.py b/fdroidserver/dscanner.py
index d8b97ddab71462e87b470dbf759a01021085e984..5622fc4dfc1b9fd9372c125eafaf5feb43f2a8ff 100644 (file)
--- a/fdroidserver/dscanner.py
+++ b/fdroidserver/dscanner.py
@@ -409,7 +409,7 @@ def main():
 
     parser.add_argument(
         "app_id", nargs='*',
-        help=_("app-id with optional versioncode in the form APPID[:VERCODE]"))
+        help=_("applicationId with optional versionCode in the form APPID[:VERCODE]"))
     parser.add_argument(
         "-l", "--latest", action="store_true", default=False,
         help=_("Scan only the latest version of each package"))

diff --git a/fdroidserver/install.py b/fdroidserver/install.py
index 3b58b6f566e30e20b58aae68b00b6882d972dc65..e3e21ff5a4dfe5a0f5da01ce16d9c820aa70b058 100644 (file)
--- a/fdroidserver/install.py
+++ b/fdroidserver/install.py
@@ -50,7 +50,7 @@ def main():
     # Parse command line...
     parser = ArgumentParser(usage="%(prog)s [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
     common.setup_global_opts(parser)
-    parser.add_argument("appid", nargs='*', help=_("app-id with optional versionCode in the form APPID[:VERCODE]"))
+    parser.add_argument("appid", nargs='*', help=_("applicationId with optional versionCode in the form APPID[:VERCODE]"))
     parser.add_argument("-a", "--all", action="store_true", default=False,
                         help=_("Install all signed applications available"))
     options = parser.parse_args()

diff --git a/fdroidserver/lint.py b/fdroidserver/lint.py
index 1dba32fe9d16c49debb3a4f634f94800541f43c1..492a09fc05a87b607077a10f1e063bc39516f438 100644 (file)
--- a/fdroidserver/lint.py
+++ b/fdroidserver/lint.py
@@ -417,7 +417,7 @@ def main():
     common.setup_global_opts(parser)
     parser.add_argument("-f", "--format", action="store_true", default=False,
                         help=_("Also warn about formatting issues, like rewritemeta -l"))
-    parser.add_argument("appid", nargs='*', help=_("app-id in the form APPID"))
+    parser.add_argument("appid", nargs='*', help=_("applicationId in the form APPID"))
     metadata.add_metadata_arguments(parser)
     options = parser.parse_args()
     metadata.warnings_action = options.W

diff --git a/fdroidserver/publish.py b/fdroidserver/publish.py
index 6f61753ae3e827633dccaa3d696eddba7b43f423..94cf166b45b78d15b0cfc60c6bede6061dc590a5 100644 (file)
--- a/fdroidserver/publish.py
+++ b/fdroidserver/publish.py
@@ -44,7 +44,7 @@ def main():
     parser = ArgumentParser(usage="%(prog)s [options] "
                             "[APPID[:VERCODE] [APPID[:VERCODE] ...]]")
     common.setup_global_opts(parser)
-    parser.add_argument("appid", nargs='*', help=_("app-id with optional versionCode in the form APPID[:VERCODE]"))
+    parser.add_argument("appid", nargs='*', help=_("applicationId with optional versionCode in the form APPID[:VERCODE]"))
     metadata.add_metadata_arguments(parser)
     options = parser.parse_args()
     metadata.warnings_action = options.W

diff --git a/fdroidserver/rewritemeta.py b/fdroidserver/rewritemeta.py
index dd0cde10f6fee933e49401688771aa238fc713bc..776e1f14c41e034b1db3f6e80b908d63d86668c5 100644 (file)
--- a/fdroidserver/rewritemeta.py
+++ b/fdroidserver/rewritemeta.py
@@ -55,7 +55,7 @@ def main():
                         help=_("List files that would be reformatted"))
     parser.add_argument("-t", "--to", default=None,
                         help=_("Rewrite to a specific format: ") + ', '.join(supported))
-    parser.add_argument("appid", nargs='*', help=_("app-id in the form APPID"))
+    parser.add_argument("appid", nargs='*', help=_("applicationId in the form APPID"))
     metadata.add_metadata_arguments(parser)
     options = parser.parse_args()
     metadata.warnings_action = options.W

diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py
index b8c585f85061ed95a25c08ac0d6c8f09cb7332c2..874f0b0081d72e489981ea74cc73a89f02a2c7fb 100644 (file)
--- a/fdroidserver/scanner.py
+++ b/fdroidserver/scanner.py
@@ -257,7 +257,7 @@ def main():
     # Parse command line...
     parser = ArgumentParser(usage="%(prog)s [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
     common.setup_global_opts(parser)
-    parser.add_argument("appid", nargs='*', help=_("app-id with optional versionCode in the form APPID[:VERCODE]"))
+    parser.add_argument("appid", nargs='*', help=_("applicationId with optional versionCode in the form APPID[:VERCODE]"))
     metadata.add_metadata_arguments(parser)
     options = parser.parse_args()
     metadata.warnings_action = options.W

diff --git a/fdroidserver/verify.py b/fdroidserver/verify.py
index cbd62ef61f03f9565df10caae46de4d316658aa6..9c4015583532b9aedb09854b91115d3175010331 100644 (file)
--- a/fdroidserver/verify.py
+++ b/fdroidserver/verify.py
@@ -39,7 +39,7 @@ def main():
     # Parse command line...
     parser = ArgumentParser(usage="%(prog)s [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
     common.setup_global_opts(parser)
-    parser.add_argument("appid", nargs='*', help=_("app-id with optional versionCode in the form APPID[:VERCODE]"))
+    parser.add_argument("appid", nargs='*', help=_("applicationId with optional versionCode in the form APPID[:VERCODE]"))
     options = parser.parse_args()
 
     config = common.read_config(options)