colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: replace 'dev' and 'con' OBJECTs by 'device', resp. 'connection'

Browse Source 
Shorter forms work as previously. Thus, all of these commands are valid:
nmcli device, nmcli devic, nmcli devi, nmcli dev, nmcli de, nmcli d
nmcli connection, nmcli connectio, ..., nmcli conn, nmcli con, ..., nmcli c
This commit is contained in:
Jiří Klimeš
2012-11-13 14:43:14 +01:00
parent c8974bc32d
commit e9e2c5645f
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cli/src/connections.c
View File

@@ -187,7 +187,7 @@ static void
usage (void) usage (void)
{ {
fprintf (stderr, fprintf (stderr,
_("Usage: nmcli con { COMMAND | help }\n" _("Usage: nmcli connection { COMMAND | help }\n"
" COMMAND := { list | status | up | down | delete }\n\n" " COMMAND := { list | status | up | down | delete }\n\n"
" list [id <id> | uuid <id>]\n" " list [id <id> | uuid <id>]\n"
" status [id <id> | uuid <id> | path <path>]\n" " status [id <id> | uuid <id> | path <path>]\n"
@@ -2028,7 +2028,7 @@ get_connections_cb (NMRemoteSettings *settings, gpointer user_data)
quit (); quit ();
} }
/* Entry point function for connections-related commands: 'nmcli con' */ /* Entry point function for connections-related commands: 'nmcli connection' */
NMCResultCode NMCResultCode
do_connections (NmCli *nmc, int argc, char **argv) do_connections (NmCli *nmc, int argc, char **argv)
{ {

2
cli/src/devices.c
View File

@@ -240,7 +240,7 @@ static void
usage (void) usage (void)
{ {
fprintf (stderr, fprintf (stderr,
_("Usage: nmcli dev { COMMAND | help }\n\n" _("Usage: nmcli device { COMMAND | help }\n\n"
#if WITH_WIMAX #if WITH_WIMAX
" COMMAND := { status | list | disconnect | wifi | wimax }\n\n" " COMMAND := { status | list | disconnect | wifi | wimax }\n\n"
#else #else

19
cli/src/nmcli.c
View File

@@ -16,7 +16,7 @@
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
* *
* (C) Copyright 2010 - 2011 Red Hat, Inc. * (C) Copyright 2010 - 2012 Red Hat, Inc.
*/ */
/* Generated configuration file */ /* Generated configuration file */
@@ -73,7 +73,8 @@ static void
usage (const char *prog_name) usage (const char *prog_name)
{ {
fprintf (stderr, fprintf (stderr,
_("Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n\n" _("Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
"\n"
"OPTIONS\n" "OPTIONS\n"
" -t[erse] terse output\n" " -t[erse] terse output\n"
" -p[retty] pretty output\n" " -p[retty] pretty output\n"
@@ -82,11 +83,13 @@ usage (const char *prog_name)
" -e[scape] yes|no escape columns separators in values\n" " -e[scape] yes|no escape columns separators in values\n"
" -n[ocheck] don't check nmcli and NetworkManager versions\n" " -n[ocheck] don't check nmcli and NetworkManager versions\n"
" -v[ersion] show program version\n" " -v[ersion] show program version\n"
" -h[elp] print this help\n\n" " -h[elp] print this help\n"
"\n"
"OBJECT\n" "OBJECT\n"
" nm NetworkManager status\n" " nm NetworkManager's status\n"
" con NetworkManager connections\n" " c[onnection] NetworkManager's connections\n"
" dev devices managed by NetworkManager\n\n"), " d[evice] devices managed by NetworkManager\n"
"\n"),
prog_name); prog_name);
} }
@@ -102,8 +105,8 @@ static const struct cmd {
NMCResultCode (*func) (NmCli *nmc, int argc, char **argv); NMCResultCode (*func) (NmCli *nmc, int argc, char **argv);
} nmcli_cmds[] = { } nmcli_cmds[] = {
{ "nm", do_network_manager }, { "nm", do_network_manager },
{ "con", do_connections }, { "connection", do_connections },
{ "dev", do_devices }, { "device", do_devices },
{ "help", do_help }, { "help", do_help },
{ 0 } { 0 }
}; };