Merge some QoL improvements from staging branch

- Build executable in top-level buildroot
- Use meson sourceset
- Pull in poi-crash and poi-update from staging
- Remove extraneous scripts in tools/
- Pull in configure scripts in scripts/

1 files changed, 2 insertions, 15 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 7889c08..f4f2b78 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -8,11 +8,11 @@
 
 #include "browser.h"
 #include "builtins.h"
-#include "conf.hpp"
 #include "configuration.h"
 #include "crashhandler.h"
 #include "session/session.h"
 #include "session/sessiondialog.h"
+#include "settings.h"
 #include "util.h"
 #include "version.h"
 #include <QFile>
@@ -91,20 +91,7 @@ int main(int argc, char **argv)
             return builtins::build();
 
         // create and load configuration
-        const std::string config_path = [&]() {
-            std::string path;
-            if(cmd_config)
-                path = args::get(cmd_config);
-            else
-                path = std::string(CONFIG_POI_CFG_PATH);
-
-            if(path.front() == '~')
-                path.replace(0, 1, QStandardPaths::writableLocation(QStandardPaths::HomeLocation).toStdString());
-
-            return path;
-        }();
-        spdlog::debug("Opening config file {}", config_path);
-        init_conf(config_path);
+        init_conf(args::get(cmd_config));
 
         if(cmd_args) {
             const auto front = args::get(cmd_args).front();