From 4eeea231e8068f7efd2e1211ccd4c43bb7516843 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Thu, 17 Sep 2015 15:55:10 +0200
Subject: [PATCH] Rename repo-contents to ls-remote

This matches the other command names
---
 app/Makefile.am.inc                              |  2 +-
 ...o-contents.c => xdg-app-builtins-ls-remote.c} |  6 +++---
 app/xdg-app-builtins.h                           |  2 +-
 app/xdg-app-main.c                               |  2 +-
 doc/Makefile.am                                  |  2 +-
 ...p-repo-contents.xml => xdg-app-ls-remote.xml} | 16 ++++++++--------
 6 files changed, 15 insertions(+), 15 deletions(-)
 rename app/{xdg-app-builtins-repo-contents.c => xdg-app-builtins-ls-remote.c} (94%)
 rename doc/{xdg-app-repo-contents.xml => xdg-app-ls-remote.xml} (90%)

diff --git a/app/Makefile.am.inc b/app/Makefile.am.inc
index 70ac90cc..4b9c72a0 100644
--- a/app/Makefile.am.inc
+++ b/app/Makefile.am.inc
@@ -8,7 +8,7 @@ xdg_app_SOURCES = \
 	app/xdg-app-builtins-add-remote.c \
 	app/xdg-app-builtins-delete-remote.c \
 	app/xdg-app-builtins-list-remotes.c \
-	app/xdg-app-builtins-repo-contents.c \
+	app/xdg-app-builtins-ls-remote.c \
 	app/xdg-app-builtins-install.c \
 	app/xdg-app-builtins-override.c \
 	app/xdg-app-builtins-make-current.c \
diff --git a/app/xdg-app-builtins-repo-contents.c b/app/xdg-app-builtins-ls-remote.c
similarity index 94%
rename from app/xdg-app-builtins-repo-contents.c
rename to app/xdg-app-builtins-ls-remote.c
index 87165cdf..2a4c7e73 100644
--- a/app/xdg-app-builtins-repo-contents.c
+++ b/app/xdg-app-builtins-ls-remote.c
@@ -45,7 +45,7 @@ static GOptionEntry options[] = {
 };
 
 gboolean
-xdg_app_builtin_repo_contents (int argc, char **argv, GCancellable *cancellable, GError **error)
+xdg_app_builtin_ls_remote (int argc, char **argv, GCancellable *cancellable, GError **error)
 {
   gboolean ret = FALSE;
   GOptionContext *context;
@@ -61,14 +61,14 @@ xdg_app_builtin_repo_contents (int argc, char **argv, GCancellable *cancellable,
   const char *repository;
   g_autofree char *url = NULL;
 
-  context = g_option_context_new (" REPOSITORY - Show available runtimes and applications");
+  context = g_option_context_new (" REMOTE - Show available runtimes and applications");
 
   if (!xdg_app_option_context_parse (context, options, &argc, &argv, 0, &dir, cancellable, error))
     goto out;
 
   if (argc < 2)
     {
-      usage_error (context, "REPOSITORY must be specified", error);
+      usage_error (context, "REMOTE must be specified", error);
       goto out;
     }
 
diff --git a/app/xdg-app-builtins.h b/app/xdg-app-builtins.h
index fe8c0351..5f446d58 100644
--- a/app/xdg-app-builtins.h
+++ b/app/xdg-app-builtins.h
@@ -51,8 +51,8 @@ void usage_error (GOptionContext *context,
 BUILTINPROTO(add_remote);
 BUILTINPROTO(modify_remote);
 BUILTINPROTO(delete_remote);
+BUILTINPROTO(ls_remote);
 BUILTINPROTO(list_remotes);
-BUILTINPROTO(repo_contents);
 BUILTINPROTO(install_runtime);
 BUILTINPROTO(update_runtime);
 BUILTINPROTO(uninstall_runtime);
diff --git a/app/xdg-app-main.c b/app/xdg-app-main.c
index 829e0f54..ef8fb6e9 100644
--- a/app/xdg-app-main.c
+++ b/app/xdg-app-main.c
@@ -44,8 +44,8 @@ static XdgAppCommand commands[] = {
   { "add-remote", xdg_app_builtin_add_remote },
   { "delete-remote", xdg_app_builtin_delete_remote },
   { "modify-remote", xdg_app_builtin_modify_remote },
+  { "ls-remote", xdg_app_builtin_ls_remote },
   { "list-remotes", xdg_app_builtin_list_remotes },
-  { "repo-contents", xdg_app_builtin_repo_contents },
   { "install-runtime", xdg_app_builtin_install_runtime },
   { "update-runtime", xdg_app_builtin_update_runtime },
   { "uninstall-runtime", xdg_app_builtin_uninstall_runtime },
diff --git a/doc/Makefile.am b/doc/Makefile.am
index c427729a..7346ba34 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -17,7 +17,7 @@ man_MANS = \
 	xdg-app-add-remote.1 		\
 	xdg-app-delete-remote.1		\
 	xdg-app-list-remotes.1 		\
-	xdg-app-repo-contents.1		\
+	xdg-app-ls-remote.1		\
 	xdg-app-install-runtime.1 	\
 	xdg-app-update-runtime.1 	\
 	xdg-app-uninstall-runtime.1 	\
diff --git a/doc/xdg-app-repo-contents.xml b/doc/xdg-app-ls-remote.xml
similarity index 90%
rename from doc/xdg-app-repo-contents.xml
rename to doc/xdg-app-ls-remote.xml
index 02250bbe..100aa5da 100644
--- a/doc/xdg-app-repo-contents.xml
+++ b/doc/xdg-app-ls-remote.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<refentry id="xdg-app-repo-contents">
+<refentry id="xdg-app-ls-remote">
 
     <refentryinfo>
-        <title>xdg-app repo-contents</title>
+        <title>xdg-app ls-remote</title>
         <productname>xdg-app</productname>
 
         <authorgroup>
@@ -19,20 +19,20 @@
     </refentryinfo>
 
     <refmeta>
-        <refentrytitle>xdg-app repo-contents</refentrytitle>
+        <refentrytitle>xdg-app ls-remote</refentrytitle>
         <manvolnum>1</manvolnum>
     </refmeta>
 
     <refnamediv>
-        <refname>xdg-app-repo-contents</refname>
+        <refname>xdg-app-ls-remote</refname>
         <refpurpose>Show available runtimes and applications</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>xdg-app repo-contents</command>
+                <command>xdg-app ls-remote</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
-                <arg choice="plain">REPOSITORY</arg>
+                <arg choice="plain">REMOTE</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
 
@@ -41,7 +41,7 @@
 
         <para>
             Shows runtimes and applications that are available in the
-            remote repository with the name <arg choice="plain">REPOSITORY</arg>.
+            remote repository with the name <arg choice="plain">REMOTE</arg>.
             You can find all configured remote repositories with xdg-app list-repos.
         </para>
         <para>
@@ -137,7 +137,7 @@
         <title>Examples</title>
 
         <para>
-            <command>$ xdg-app --user repo-contents --only-apps testrepo</command>
+            <command>$ xdg-app --user ls-remote --only-apps testrepo</command>
         </para>
 <programlisting>
 org.gnome.Builder