From 31e492fa1affe9ea44cc265eeeb60d6691452b77 Mon Sep 17 00:00:00 2001
From: Simon Fels <morphis@gravedo.de>
Date: Sat, 17 Sep 2016 11:17:06 +0200
Subject: [PATCH] Drop app suffix from install/launch commands

---
 src/CMakeLists.txt                              | 4 ++--
 src/anbox/cmds/{install_app.cpp => install.cpp} | 6 +++---
 src/anbox/cmds/{install_app.h => install.h}     | 8 ++++----
 src/anbox/cmds/{launch_app.cpp => launch.cpp}   | 6 +++---
 src/anbox/cmds/{launch_app.h => launch.h}       | 8 ++++----
 src/anbox/daemon.cpp                            | 8 ++++----
 6 files changed, 20 insertions(+), 20 deletions(-)
 rename src/anbox/cmds/{install_app.cpp => install.cpp} (86%)
 rename src/anbox/cmds/{install_app.h => install.h} (85%)
 rename src/anbox/cmds/{launch_app.cpp => launch.cpp} (87%)
 rename src/anbox/cmds/{launch_app.h => launch.h} (86%)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e105a8e..46c95dc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -123,8 +123,8 @@ set(SOURCES
 
     anbox/cmds/version.cpp
     anbox/cmds/run.cpp
-    anbox/cmds/install_app.cpp
-    anbox/cmds/launch_app.cpp
+    anbox/cmds/install.cpp
+    anbox/cmds/launch.cpp
     anbox/cmds/container_manager.cpp
 
     anbox/do_not_copy_or_move.h
diff --git a/src/anbox/cmds/install_app.cpp b/src/anbox/cmds/install.cpp
similarity index 86%
rename from src/anbox/cmds/install_app.cpp
rename to src/anbox/cmds/install.cpp
index d95c399..82d4eba 100644
--- a/src/anbox/cmds/install_app.cpp
+++ b/src/anbox/cmds/install.cpp
@@ -15,7 +15,7 @@
  *
  */
 
-#include "anbox/cmds/install_app.h"
+#include "anbox/cmds/install.h"
 #include "anbox/dbus/stub/application_manager.h"
 
 #include <core/dbus/asio/executor.h>
@@ -24,8 +24,8 @@
 
 namespace fs = boost::filesystem;
 
-anbox::cmds::InstallApp::InstallApp()
-    : CommandWithFlagsAndAction{cli::Name{"install-app"}, cli::Usage{"install-app"}, cli::Description{"Install specified application in the Android container"}}
+anbox::cmds::Install::Install()
+    : CommandWithFlagsAndAction{cli::Name{"install"}, cli::Usage{"install"}, cli::Description{"Install specified application in the Android container"}}
 {
     flag(cli::make_flag(cli::Name{"apk"}, cli::Description{"Path to APK to install"}, apk_));
     action([this](const cli::Command::Context&) {
diff --git a/src/anbox/cmds/install_app.h b/src/anbox/cmds/install.h
similarity index 85%
rename from src/anbox/cmds/install_app.h
rename to src/anbox/cmds/install.h
index ba3edbe..d7833dd 100644
--- a/src/anbox/cmds/install_app.h
+++ b/src/anbox/cmds/install.h
@@ -15,8 +15,8 @@
  *
  */
 
-#ifndef ANBOX_CMDS_INSTALL_APP_H_
-#define ANBOX_CMDS_INSTALL_APP_H_
+#ifndef ANBOX_CMDS_INSTALL_H_
+#define ANBOX_CMDS_INSTALL_H_
 
 #include <functional>
 #include <iostream>
@@ -26,9 +26,9 @@
 
 namespace anbox {
 namespace cmds {
-class InstallApp : public cli::CommandWithFlagsAndAction {
+class Install : public cli::CommandWithFlagsAndAction {
 public:
-    InstallApp();
+    Install();
 
 private:
     std::string apk_;
diff --git a/src/anbox/cmds/launch_app.cpp b/src/anbox/cmds/launch.cpp
similarity index 87%
rename from src/anbox/cmds/launch_app.cpp
rename to src/anbox/cmds/launch.cpp
index 1cfdd2b..90483ba 100644
--- a/src/anbox/cmds/launch_app.cpp
+++ b/src/anbox/cmds/launch.cpp
@@ -15,7 +15,7 @@
  *
  */
 
-#include "anbox/cmds/launch_app.h"
+#include "anbox/cmds/launch.h"
 #include "anbox/dbus/stub/application_manager.h"
 
 #include <core/dbus/asio/executor.h>
@@ -24,8 +24,8 @@
 
 namespace fs = boost::filesystem;
 
-anbox::cmds::LaunchApp::LaunchApp()
-    : CommandWithFlagsAndAction{cli::Name{"launch-app"}, cli::Usage{"launch-app"}, cli::Description{"Launch specified application in the Android container"}}
+anbox::cmds::Launch::Launch()
+    : CommandWithFlagsAndAction{cli::Name{"launch"}, cli::Usage{"launch"}, cli::Description{"Launch specified application in the Android container"}}
 {
     flag(cli::make_flag(cli::Name{"package"}, cli::Description{"Package the application is part of"}, package_));
     flag(cli::make_flag(cli::Name{"activity"}, cli::Description{"Activity of the application to start"}, activity_));
diff --git a/src/anbox/cmds/launch_app.h b/src/anbox/cmds/launch.h
similarity index 86%
rename from src/anbox/cmds/launch_app.h
rename to src/anbox/cmds/launch.h
index 917f110..bbbbe54 100644
--- a/src/anbox/cmds/launch_app.h
+++ b/src/anbox/cmds/launch.h
@@ -15,8 +15,8 @@
  *
  */
 
-#ifndef ANBOX_CMDS_LAUNCH_APP_H_
-#define ANBOX_CMDS_LAUNCH_APP_H_
+#ifndef ANBOX_CMDS_LAUNCH_H_
+#define ANBOX_CMDS_LAUNCH_H_
 
 #include <functional>
 #include <iostream>
@@ -26,9 +26,9 @@
 
 namespace anbox {
 namespace cmds {
-class LaunchApp : public cli::CommandWithFlagsAndAction {
+class Launch : public cli::CommandWithFlagsAndAction {
 public:
-    LaunchApp();
+    Launch();
 
 private:
     std::string package_;
diff --git a/src/anbox/daemon.cpp b/src/anbox/daemon.cpp
index 53a7eb8..dd91e39 100644
--- a/src/anbox/daemon.cpp
+++ b/src/anbox/daemon.cpp
@@ -24,8 +24,8 @@
 
 #include "anbox/cmds/version.h"
 #include "anbox/cmds/run.h"
-#include "anbox/cmds/install_app.h"
-#include "anbox/cmds/launch_app.h"
+#include "anbox/cmds/install.h"
+#include "anbox/cmds/launch.h"
 #include "anbox/cmds/container_manager.h"
 
 #include <boost/filesystem.hpp>
@@ -38,8 +38,8 @@ Daemon::Daemon() :
 
     cmd.command(std::make_shared<cmds::Version>())
        .command(std::make_shared<cmds::Run>())
-       .command(std::make_shared<cmds::InstallApp>())
-       .command(std::make_shared<cmds::LaunchApp>())
+       .command(std::make_shared<cmds::Install>())
+       .command(std::make_shared<cmds::Launch>())
        .command(std::make_shared<cmds::ContainerManager>());
 }