jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop app suffix from install/launch commands

Browse source
This commit is contained in:
Simon Fels 2016-09-17 11:17:06 +02:00
commit 31e492fa1a
6 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/CMakeLists.txt
View file

@ -123,8 +123,8 @@ set(SOURCES
anbox/cmds/version.cpp anbox/cmds/version.cpp
anbox/cmds/run.cpp anbox/cmds/run.cpp
anbox/cmds/install_app.cpp anbox/cmds/install.cpp
anbox/cmds/launch_app.cpp anbox/cmds/launch.cpp
anbox/cmds/container_manager.cpp anbox/cmds/container_manager.cpp
anbox/do_not_copy_or_move.h anbox/do_not_copy_or_move.h

6
src/anbox/cmds/install_app.cpp → src/anbox/cmds/install.cpp
View file

@ -15,7 +15,7 @@
* *
*/ */
#include "anbox/cmds/install_app.h" #include "anbox/cmds/install.h"
#include "anbox/dbus/stub/application_manager.h" #include "anbox/dbus/stub/application_manager.h"
#include <core/dbus/asio/executor.h> #include <core/dbus/asio/executor.h>
@ -24,8 +24,8 @@
namespace fs = boost::filesystem; namespace fs = boost::filesystem;
anbox::cmds::InstallApp::InstallApp() anbox::cmds::Install::Install()
: CommandWithFlagsAndAction{cli::Name{"install-app"}, cli::Usage{"install-app"}, cli::Description{"Install specified application in the Android container"}} : 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_)); flag(cli::make_flag(cli::Name{"apk"}, cli::Description{"Path to APK to install"}, apk_));
action([this](const cli::Command::Context&) { action([this](const cli::Command::Context&) {

8
src/anbox/cmds/install_app.h → src/anbox/cmds/install.h
View file

@ -15,8 +15,8 @@
* *
*/ */
#ifndef ANBOX_CMDS_INSTALL_APP_H_ #ifndef ANBOX_CMDS_INSTALL_H_
#define ANBOX_CMDS_INSTALL_APP_H_ #define ANBOX_CMDS_INSTALL_H_
#include <functional> #include <functional>
#include <iostream> #include <iostream>
@ -26,9 +26,9 @@
namespace anbox { namespace anbox {
namespace cmds { namespace cmds {
class InstallApp : public cli::CommandWithFlagsAndAction { class Install : public cli::CommandWithFlagsAndAction {
public: public:
InstallApp(); Install();
private: private:
std::string apk_; std::string apk_;

6
src/anbox/cmds/launch_app.cpp → src/anbox/cmds/launch.cpp
View file

@ -15,7 +15,7 @@
* *
*/ */
#include "anbox/cmds/launch_app.h" #include "anbox/cmds/launch.h"
#include "anbox/dbus/stub/application_manager.h" #include "anbox/dbus/stub/application_manager.h"
#include <core/dbus/asio/executor.h> #include <core/dbus/asio/executor.h>
@ -24,8 +24,8 @@
namespace fs = boost::filesystem; namespace fs = boost::filesystem;
anbox::cmds::LaunchApp::LaunchApp() anbox::cmds::Launch::Launch()
: CommandWithFlagsAndAction{cli::Name{"launch-app"}, cli::Usage{"launch-app"}, cli::Description{"Launch specified application in the Android container"}} : 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{"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_)); flag(cli::make_flag(cli::Name{"activity"}, cli::Description{"Activity of the application to start"}, activity_));

8
src/anbox/cmds/launch_app.h → src/anbox/cmds/launch.h
View file

@ -15,8 +15,8 @@
* *
*/ */
#ifndef ANBOX_CMDS_LAUNCH_APP_H_ #ifndef ANBOX_CMDS_LAUNCH_H_
#define ANBOX_CMDS_LAUNCH_APP_H_ #define ANBOX_CMDS_LAUNCH_H_
#include <functional> #include <functional>
#include <iostream> #include <iostream>
@ -26,9 +26,9 @@
namespace anbox { namespace anbox {
namespace cmds { namespace cmds {
class LaunchApp : public cli::CommandWithFlagsAndAction { class Launch : public cli::CommandWithFlagsAndAction {
public: public:
LaunchApp(); Launch();
private: private:
std::string package_; std::string package_;

8
src/anbox/daemon.cpp
View file

@ -24,8 +24,8 @@
#include "anbox/cmds/version.h" #include "anbox/cmds/version.h"
#include "anbox/cmds/run.h" #include "anbox/cmds/run.h"
#include "anbox/cmds/install_app.h" #include "anbox/cmds/install.h"
#include "anbox/cmds/launch_app.h" #include "anbox/cmds/launch.h"
#include "anbox/cmds/container_manager.h" #include "anbox/cmds/container_manager.h"
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
@ -38,8 +38,8 @@ Daemon::Daemon() :
cmd.command(std::make_shared<cmds::Version>()) cmd.command(std::make_shared<cmds::Version>())
.command(std::make_shared<cmds::Run>()) .command(std::make_shared<cmds::Run>())
.command(std::make_shared<cmds::InstallApp>()) .command(std::make_shared<cmds::Install>())
.command(std::make_shared<cmds::LaunchApp>()) .command(std::make_shared<cmds::Launch>())
.command(std::make_shared<cmds::ContainerManager>()); .command(std::make_shared<cmds::ContainerManager>());
} }