From 864b16a2cb469c1c8ab913c0cbda66a0e0bd22ef Mon Sep 17 00:00:00 2001
From: Jess Valarezo <valarezo.jessica@gmail.com>
Date: Tue, 31 Oct 2017 10:56:19 -0700
Subject: [PATCH] ctr: alphabetize commands, rename signals

Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
---
 cmd/ctr/commands/containers/containers.go          |  4 ++--
 cmd/ctr/commands/content/content.go                | 10 +++++-----
 cmd/ctr/commands/namespaces/namespaces.go          |  2 +-
 .../{signals_linux.go => signal_map_linux.go}      |  0
 .../{signals_unix.go => signal_map_unix.go}        |  0
 .../{signals_windows.go => signal_map_windows.go}  |  0
 cmd/ctr/commands/snapshot/snapshot.go              | 14 +++++++-------
 7 files changed, 15 insertions(+), 15 deletions(-)
 rename cmd/ctr/commands/{signals_linux.go => signal_map_linux.go} (100%)
 rename cmd/ctr/commands/{signals_unix.go => signal_map_unix.go} (100%)
 rename cmd/ctr/commands/{signals_windows.go => signal_map_windows.go} (100%)

diff --git a/cmd/ctr/commands/containers/containers.go b/cmd/ctr/commands/containers/containers.go
index 9cf5df465..5bd9fb456 100644
--- a/cmd/ctr/commands/containers/containers.go
+++ b/cmd/ctr/commands/containers/containers.go
@@ -20,10 +20,10 @@ var Command = cli.Command{
 	Usage:   "manage containers",
 	Aliases: []string{"c"},
 	Subcommands: []cli.Command{
-		listCommand,
 		deleteCommand,
-		setLabelsCommand,
 		infoCommand,
+		listCommand,
+		setLabelsCommand,
 	},
 }
 
diff --git a/cmd/ctr/commands/content/content.go b/cmd/ctr/commands/content/content.go
index 2cfbeaa06..d3cd8da4e 100644
--- a/cmd/ctr/commands/content/content.go
+++ b/cmd/ctr/commands/content/content.go
@@ -27,16 +27,16 @@ var (
 		Name:  "content",
 		Usage: "manage content",
 		Subcommands: cli.Commands{
-			listCommand,
-			ingestCommand,
 			activeIngestCommand,
-			getCommand,
-			editCommand,
 			deleteCommand,
-			setLabelsCommand,
+			editCommand,
 			fetchCommand,
 			fetchObjectCommand,
+			getCommand,
+			ingestCommand,
+			listCommand,
 			pushObjectCommand,
+			setLabelsCommand,
 		},
 	}
 
diff --git a/cmd/ctr/commands/namespaces/namespaces.go b/cmd/ctr/commands/namespaces/namespaces.go
index ec0ba3739..bedaf8522 100644
--- a/cmd/ctr/commands/namespaces/namespaces.go
+++ b/cmd/ctr/commands/namespaces/namespaces.go
@@ -20,9 +20,9 @@ var Command = cli.Command{
 	Usage: "manage namespaces",
 	Subcommands: cli.Commands{
 		createCommand,
-		setLabelsCommand,
 		listCommand,
 		removeCommand,
+		setLabelsCommand,
 	},
 }
 
diff --git a/cmd/ctr/commands/signals_linux.go b/cmd/ctr/commands/signal_map_linux.go
similarity index 100%
rename from cmd/ctr/commands/signals_linux.go
rename to cmd/ctr/commands/signal_map_linux.go
diff --git a/cmd/ctr/commands/signals_unix.go b/cmd/ctr/commands/signal_map_unix.go
similarity index 100%
rename from cmd/ctr/commands/signals_unix.go
rename to cmd/ctr/commands/signal_map_unix.go
diff --git a/cmd/ctr/commands/signals_windows.go b/cmd/ctr/commands/signal_map_windows.go
similarity index 100%
rename from cmd/ctr/commands/signals_windows.go
rename to cmd/ctr/commands/signal_map_windows.go
diff --git a/cmd/ctr/commands/snapshot/snapshot.go b/cmd/ctr/commands/snapshot/snapshot.go
index 9def7a819..734871823 100644
--- a/cmd/ctr/commands/snapshot/snapshot.go
+++ b/cmd/ctr/commands/snapshot/snapshot.go
@@ -23,17 +23,17 @@ var Command = cli.Command{
 	Usage: "manage snapshots",
 	Flags: commands.SnapshotterFlags,
 	Subcommands: cli.Commands{
-		listCommand,
-		usageCommand,
-		removeCommand,
-		prepareCommand,
-		viewCommand,
-		treeCommand,
-		mountCommand,
 		commitCommand,
 		infoCommand,
+		listCommand,
+		mountCommand,
+		prepareCommand,
+		removeCommand,
 		setLabelCommand,
+		treeCommand,
 		unpackCommand,
+		usageCommand,
+		viewCommand,
 	},
 }