From abc12e373ac9c923412baecb9b0cdd03434abbab Mon Sep 17 00:00:00 2001
From: Jack Foltz <jack@foltz.io>
Date: Sun, 9 Dec 2018 00:44:26 -0500
Subject: [PATCH] Make all paths relative to cwd and add lib

---
 lib/package.py | 13 +++++++------
 lib/path.py    | 13 +++++++++++++
 2 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 lib/path.py

diff --git a/lib/package.py b/lib/package.py
index f83ce4c..2e04172 100644
--- a/lib/package.py
+++ b/lib/package.py
@@ -1,5 +1,6 @@
 from pathlib import Path
 from lib.menu import ChecklistMenu
+from lib.path import local_path, deploy_path
 
 def toggle(obj, prop):
     return lambda b: setattr(obj, prop, b)
@@ -50,23 +51,23 @@ class Package:
         return [(k, v) for k, v in vars(self).items() if v != None and k not in excepted]
 
     def transform_default(self, prop, default, basepath):
-        default_path = Path(default)
+        default_path = local_path(basepath, default)
         if hasattr(self, prop):
             if isinstance(self[prop], list):
-                self[prop] = list(map(lambda p: Path(p), self[prop]))
+                self[prop] = list(map(lambda p: local_path(basepath, p), self[prop]))
             elif self[prop] == 'none':
                 self[prop] = None
             elif self[prop] != None:
-                self[prop] = [Path(self[prop])]
+                self[prop] = [local_path(basepath, self[prop])]
         elif (Path(basepath) / default_path).is_dir() or (Path(basepath) / default_path).is_file():
             self[prop] = [default_path]
         else:
             self[prop] = None
 
     def update_from_files(self):
-        self.transform_default('config', self.name, 'lain/.config')
-        self.transform_default('script', self.name + '.fish', 'scripts')
-        self.transform_default('userunit', self.name + '.service', 'lain/.config/systemd/user')
+        self.transform_default('config', self.name, 'lain/')
+        self.transform_default('script', self.name + '.fish', 'scripts/')
+        self.transform_default('userunit', self.name + '.service', 'lain/.config/systemd/user/')
 
     @staticmethod
     def config_menu(screen, title, packages):
diff --git a/lib/path.py b/lib/path.py
new file mode 100644
index 0000000..23213ee
--- /dev/null
+++ b/lib/path.py
@@ -0,0 +1,13 @@
+from pathlib import Path
+
+def local_path(*args):
+    path = Path('./')
+    for arg in args:
+        path /= Path(arg)
+    return path
+
+def deploy_path(path):
+    start = path.parts[0]
+    target = path.parts[1:]
+    if start == 'lain':
+        return Path('~') / Path(*target)