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

Merge pull request #864 from ubports/desktop-subdir-env

Browse source 
Add ANBOX_NO_DESKTOP_SUBDIR env
This commit is contained in:
Simon Fels 2018-08-16 06:59:24 +02:00 • committed by GitHub
commit 385150ab6b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -39,8 +39,15 @@ LauncherStorage::LauncherStorage(const fs::path &path) :
LauncherStorage::~LauncherStorage() {} LauncherStorage::~LauncherStorage() {}
void LauncherStorage::reset() { void LauncherStorage::reset() {
if (fs::exists(path_)) if (fs::exists(path_)) {
fs::remove_all(path_); for(auto & p : boost::filesystem::directory_iterator(path_)) {
if (fs::is_regular_file(p)){
auto str = p.path().filename().string();
if (boost::starts_with(str, "anbox-"))
fs::remove(p);
}
}
}
} }
std::string LauncherStorage::clean_package_name(const std::string &package_name) { std::string LauncherStorage::clean_package_name(const std::string &package_name) {

1
src/anbox/application/launcher_storage.h
View file

@ -25,6 +25,7 @@
#include <vector> #include <vector>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <boost/algorithm/string/predicate.hpp>
namespace anbox { namespace anbox {
namespace application { namespace application {

2
src/anbox/system_configuration.cpp
View file

@ -99,6 +99,8 @@ std::string anbox::SystemConfiguration::input_device_dir() const {
std::string anbox::SystemConfiguration::application_item_dir() const { std::string anbox::SystemConfiguration::application_item_dir() const {
static auto dir = xdg::data().home() / "applications" / "anbox"; static auto dir = xdg::data().home() / "applications" / "anbox";
if (anbox::utils::get_env_value("ANBOX_NO_DESKTOP_SUBDIR").length() > 0)
dir = xdg::data().home() / "applications";
return dir.string(); return dir.string();
} }