From 754d68c74a24fd4e47031bf74f929fdbb1db4c88 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 30 Nov 2018 23:24:54 -0500 Subject: [PATCH] Rename list commands Rename permission-list and document-list to permissions and documents, for consistency with how we handle remotes. The old command names are kept as hidden aliases. Closes: #2131 Closes: #2366 Approved by: mwleeds --- app/flatpak-main.c | 6 ++++-- doc/Makefile.am | 4 ++-- doc/flatpak-docs.xml.in | 4 ++-- doc/flatpak-document-export.xml | 2 +- doc/flatpak-document-info.xml | 2 +- doc/flatpak-document-unexport.xml | 2 +- ...flatpak-document-list.xml => flatpak-documents.xml} | 10 +++++----- doc/flatpak-permission-remove.xml | 2 +- doc/flatpak-permission-reset.xml | 2 +- doc/flatpak-permission-show.xml | 2 +- ...pak-permission-list.xml => flatpak-permissions.xml} | 10 +++++----- doc/flatpak.xml | 4 ++-- tests/test-basic.sh | 6 +++--- 13 files changed, 29 insertions(+), 27 deletions(-) rename doc/{flatpak-document-list.xml => flatpak-documents.xml} (91%) rename doc/{flatpak-permission-list.xml => flatpak-permissions.xml} (92%) diff --git a/app/flatpak-main.c b/app/flatpak-main.c index eb02e361..596069c8 100644 --- a/app/flatpak-main.c +++ b/app/flatpak-main.c @@ -88,15 +88,17 @@ static FlatpakCommand commands[] = { /* translators: please keep the leading newline and space */ { N_("\n Manage file access") }, + { "documents", N_("List exported files"), flatpak_builtin_document_list, flatpak_complete_document_list }, { "document-export", N_("Grant an application access to a specific file"), flatpak_builtin_document_export, flatpak_complete_document_export }, { "document-unexport", N_("Revoke access to a specific file"), flatpak_builtin_document_unexport, flatpak_complete_document_unexport }, { "document-info", N_("Show information about a specific file"), flatpak_builtin_document_info, flatpak_complete_document_info }, - { "document-list", N_("List exported files"), flatpak_builtin_document_list, flatpak_complete_document_list }, + { "document-list", NULL, flatpak_builtin_document_list, flatpak_complete_document_list, TRUE }, /* translators: please keep the leading newline and space */ { N_("\n Manage dynamic permissions") }, + { "permissions", N_("List permissions"), flatpak_builtin_permission_list, flatpak_complete_permission_list }, { "permission-remove", N_("Remove item from permission store"), flatpak_builtin_permission_remove, flatpak_complete_permission_remove }, - { "permission-list", N_("List permissions"), flatpak_builtin_permission_list, flatpak_complete_permission_list }, + { "permission-list", NULL, flatpak_builtin_permission_list, flatpak_complete_permission_list, TRUE }, { "permission-show", N_("Show app permissions"), flatpak_builtin_permission_show, flatpak_complete_permission_show }, { "permission-reset", N_("Reset app permissions"), flatpak_builtin_permission_reset, flatpak_complete_permission_reset }, diff --git a/doc/Makefile.am b/doc/Makefile.am index 474422d9..c3102b48 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -39,9 +39,9 @@ man1 = \ flatpak-document-export.1 \ flatpak-document-unexport.1 \ flatpak-document-info.1 \ - flatpak-document-list.1 \ + flatpak-documents.1 \ flatpak-permission-remove.1 \ - flatpak-permission-list.1 \ + flatpak-permissions.1 \ flatpak-permission-show.1 \ flatpak-permission-reset.1 \ flatpak-build-init.1 \ diff --git a/doc/flatpak-docs.xml.in b/doc/flatpak-docs.xml.in index 2114938a..c3596a57 100644 --- a/doc/flatpak-docs.xml.in +++ b/doc/flatpak-docs.xml.in @@ -37,7 +37,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/doc/flatpak-document-export.xml b/doc/flatpak-document-export.xml index c17eb506..743948e8 100644 --- a/doc/flatpak-document-export.xml +++ b/doc/flatpak-document-export.xml @@ -217,7 +217,7 @@ flatpak1, flatpak-document-unexport1, flatpak-document-info1, - flatpak-document-list1 + flatpak-documents1 diff --git a/doc/flatpak-document-info.xml b/doc/flatpak-document-info.xml index 9740e8ad..9d7c90a0 100644 --- a/doc/flatpak-document-info.xml +++ b/doc/flatpak-document-info.xml @@ -108,7 +108,7 @@ permissions: flatpak1, flatpak-document-export1, flatpak-document-unexport1, - flatpak-document-list1 + flatpak-documents1 diff --git a/doc/flatpak-document-unexport.xml b/doc/flatpak-document-unexport.xml index 52ec7c0e..289fe987 100644 --- a/doc/flatpak-document-unexport.xml +++ b/doc/flatpak-document-unexport.xml @@ -88,7 +88,7 @@ flatpak1, flatpak-document-export1, flatpak-document-info1, - flatpak-document-list1 + flatpak-documents1 diff --git a/doc/flatpak-document-list.xml b/doc/flatpak-documents.xml similarity index 91% rename from doc/flatpak-document-list.xml rename to doc/flatpak-documents.xml index 3ea594c3..16ab7d56 100644 --- a/doc/flatpak-document-list.xml +++ b/doc/flatpak-documents.xml @@ -2,10 +2,10 @@ - + - flatpak document-list + flatpak documents flatpak @@ -19,18 +19,18 @@ - flatpak document-list + flatpak documents 1 - flatpak-document-list + flatpak-documents List exported files - flatpak document-list + flatpak documents OPTION APPID diff --git a/doc/flatpak-permission-remove.xml b/doc/flatpak-permission-remove.xml index 13a6770f..c3050088 100644 --- a/doc/flatpak-permission-remove.xml +++ b/doc/flatpak-permission-remove.xml @@ -93,7 +93,7 @@ flatpak1, - flatpak-permission-list1, + flatpak-permissions1, flatpak-permission-show1, flatpak-permission-reset1 diff --git a/doc/flatpak-permission-reset.xml b/doc/flatpak-permission-reset.xml index 2cc8745b..b81c53c4 100644 --- a/doc/flatpak-permission-reset.xml +++ b/doc/flatpak-permission-reset.xml @@ -92,7 +92,7 @@ flatpak1, - flatpak-permission-list1, + flatpak-permissions1, flatpak-permission-show1, flatpak-permission-remove1 diff --git a/doc/flatpak-permission-show.xml b/doc/flatpak-permission-show.xml index 59e171ec..08f01a6f 100644 --- a/doc/flatpak-permission-show.xml +++ b/doc/flatpak-permission-show.xml @@ -100,7 +100,7 @@ flatpak1, - flatpak-permission-list1, + flatpak-permissions1, flatpak-permission-remove1, flatpak-permission-reset1 diff --git a/doc/flatpak-permission-list.xml b/doc/flatpak-permissions.xml similarity index 92% rename from doc/flatpak-permission-list.xml rename to doc/flatpak-permissions.xml index 96400c05..fd93dba8 100644 --- a/doc/flatpak-permission-list.xml +++ b/doc/flatpak-permissions.xml @@ -2,10 +2,10 @@ - + - flatpak permission-list + flatpak permissions flatpak @@ -19,18 +19,18 @@ - flatpak permission-list + flatpak permissions 1 - flatpak-permission-list + flatpak-permissions List permissions - flatpak permission-list + flatpak permissions OPTION TABLE ID diff --git a/doc/flatpak.xml b/doc/flatpak.xml index 3703f8bb..68ee1f0f 100644 --- a/doc/flatpak.xml +++ b/doc/flatpak.xml @@ -299,7 +299,7 @@ - flatpak-document-list1 + flatpak-documents1 List exported files. @@ -318,7 +318,7 @@ - flatpak-permission-list1 + flatpak-permissions1 List permissions. diff --git a/tests/test-basic.sh b/tests/test-basic.sh index 606ac68f..8226bc48 100755 --- a/tests/test-basic.sh +++ b/tests/test-basic.sh @@ -56,8 +56,8 @@ echo "ok gl drivers" for cmd in install update uninstall list info config repair create-usb \ search run override make-current enter ps document-export \ - document-unexport document-info document-list permission-remove \ - permission-list permission-show permission-reset remotes remote-add \ + document-unexport document-info documents permission-remove \ + permissions permission-show permission-reset remotes remote-add \ remote-modify remote-delete remote-ls remote-info build-init \ build build-finish build-export build-bundle build-import-bundle \ build-sign build-update-repo build-commit-from repo kill history; @@ -70,7 +70,7 @@ done echo "ok command help" -for cmd in list ps remote-ls remotes document-list history; +for cmd in list ps remote-ls remotes documents history; do ${FLATPAK} $cmd --columns=help > help_out