Make install working

src/config.cc

@@ -3,11 +3,12 @@
 #include "logging.h"
 #include <fstream>
 #include <string>
+#include <exception>
+
 
 MainConfig::MainConfig() {
   INFO("Reading config file");
-  std::string path(getenv("HOME")); // TODO WINDOWS
+  boost::property_tree::json_parser::read_json(Singleton::config_dir() + "config.json", cfg_);
-  boost::property_tree::json_parser::read_json(path + "/.juci/config/config.json", cfg_);
   INFO("Config file read");
   GenerateSource();
   GenerateKeybindings();
@@ -75,11 +76,15 @@ void MainConfig::GenerateTerminalCommands() {
 
 void MainConfig::GenerateKeybindings() {
   auto menu = Singleton::menu();
-  DEBUG("Fetching keybindings");
+  boost::filesystem::path path(Singleton::config_dir() + "menu.xml");
+  if (!boost::filesystem::is_regular_file(path)) {
+    std::cerr << "menu.xml not found" << std::endl;
+    throw;
+  }
+  std::ifstream input(path.string());
   std::string line;
-  std::ifstream menu_xml("menu.xml");
+  if (input.is_open()) {
-  if (menu_xml.is_open()) {
+    while (getline(input, line))
-    while (getline(menu_xml, line))
       menu->ui += line;
   }
   boost::property_tree::ptree keys_json = cfg_.get_child("keybindings");

src/juci.cc

@@ -3,7 +3,7 @@
 
 void init_logging() {
   add_common_attributes();
-  add_file_log(keywords::file_name = "juci.log",
+  add_file_log(keywords::file_name = Singleton::log_dir() + "juci.log",
                keywords::auto_flush = true);
   INFO("Logging initalized");
 }

src/menu.cc

@@ -1,4 +1,5 @@
 #include "menu.h"
+#include "logging.h"
 #include <iostream>
 
 Menu::Menu() : box(Gtk::ORIENTATION_VERTICAL) {

src/menu.h

@@ -4,7 +4,6 @@
 #include <string>
 #include <unordered_map>
 #include <gtkmm.h>
-#include "logging.h"
 
 class Menu {
 public:

src/singletons.h

@@ -6,6 +6,7 @@
 #include "terminal.h"
 #include "notebook.h"
 #include "menu.h"
+#include <string>
 
 class Singleton {
 public:
@@ -19,7 +20,8 @@ public:
     static std::unique_ptr<Terminal::Config> terminal_;
     static std::unique_ptr<Directories::Config> directories_;
   };
-  
+  static std::string config_dir() { return std::string(getenv("HOME")) + "/.juci/config/"; }
+  static std::string log_dir() { return std::string(getenv("HOME")) + "/.juci/log/"; }
   static Terminal::Controller *terminal();
   static Menu *menu();
 private: