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

Merge pull request #34 from morphis/feature/minor-fixes

Browse source 
A few minor fixes to clean things up a bit
This commit is contained in:
Simon Fels 2017-02-03 08:04:09 +01:00 • committed by GitHub
commit d12aad5c01
6 changed files with 22 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/anbox/application/launcher_storage.cpp
View file

@ -48,10 +48,8 @@ void LauncherStorage::add(const Item &item) {
auto package_name = item.package;
std::replace(package_name.begin(), package_name.end(), '.', '-');
const auto item_path =
path_ / utils::string_format("anbox-%s.desktop", package_name);
const auto item_icon_path =
icon_path_ / utils::string_format("anbox-%s.png", package_name);
const auto item_path = path_ / utils::string_format("anbox-%s.desktop", package_name);
const auto item_icon_path = icon_path_ / utils::string_format("anbox-%s.png", package_name);
std::string exec = utils::string_format("%s launch ", utils::process_get_exe_path(getpid()));
@ -68,21 +66,23 @@ void LauncherStorage::add(const Item &item) {
exec += utils::string_format("--package=%s ", item.launch_intent.package);
if (!item.launch_intent.component.empty())
exec +=
utils::string_format("--component=%s ", item.launch_intent.component);
exec += utils::string_format("--component=%s ", item.launch_intent.component);
std::ofstream f(item_path.string());
f << "[Desktop Entry]" << std::endl
<< "Name=" << item.package << std::endl
<< "Exec=" << exec << std::endl
<< "Terminal=false" << std::endl
<< "Type=Application" << std::endl
<< "Icon=" << item_icon_path.string() << std::endl;
f.close();
if (auto desktop_item = std::ofstream(item_path.string())) {
desktop_item << "[Desktop Entry]" << std::endl
<< "Name=" << item.package << std::endl
<< "Exec=" << exec << std::endl
<< "Terminal=false" << std::endl
<< "Type=Application" << std::endl
<< "Icon=" << item_icon_path.string() << std::endl;
} else {
BOOST_THROW_EXCEPTION(std::runtime_error("Failed to create desktop item"));
}
f = std::ofstream(item_icon_path.string());
f.write(item.icon.data(), item.icon.size());
f.close();
if (auto icon = std::ofstream(item_icon_path.string()))
icon.write(item.icon.data(), item.icon.size());
else
BOOST_THROW_EXCEPTION(std::runtime_error("Failed to write icon"));
}
} // namespace application
} // namespace anbox

3
src/anbox/cmds/run.cpp
View file

@ -81,9 +81,6 @@ anbox::cmds::Run::Run(const BusFactory &bus_factory)
flag(cli::make_flag(cli::Name{"desktop_file_hint"},
cli::Description{"Desktop file hint for QtMir/Unity8"},
desktop_file_hint_));
flag(cli::make_flag(cli::Name{"icon"},
cli::Description{"Icon of the application to run"},
icon_));
action([this](const cli::Command::Context &) {
auto trap = core::posix::trap_signals_for_process(

1
src/anbox/cmds/run.h
View file

@ -39,7 +39,6 @@ class Run : public cli::CommandWithFlagsAndAction {
private:
BusFactory bus_factory_;
std::string desktop_file_hint_;
std::string icon_;
};
} // namespace cmds
} // namespace anbox