Bugfix: Move misc dirctory to /usr/share/rkd

riotkit-org · Nov 26, 2020 · 6d087dd · 6d087dd
1 parent a8717be
commit 6d087dd
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 2 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1 @@
+recursive-include rkd/misc *
diff --git a/rkd/context.py b/rkd/context.py
@@ -252,6 +252,7 @@ def create_unified_context(self, chdir: str = '', additional_imports: List[str]
         paths = [
             CURRENT_SCRIPT_PATH + '/internal',
             '/usr/lib/rkd',
+            '/usr/share/rkd/internal',
             os.path.expanduser('~/.rkd'),
             os.getcwd() + '/.rkd'
         ]

diff --git a/rkd/internal/__init__.py b/rkd/internal/__init__.py
diff --git a/rkd/misc/__init__.py b/rkd/misc/__init__.py
diff --git a/rkd/internal/makefile.py → rkd/misc/internal/makefile.py b/rkd/internal/makefile.py → rkd/misc/internal/makefile.py
diff --git a/...ernal/schema/org.riotkit.rkd-yaml-v1.json → ...ernal/schema/org.riotkit.rkd-yaml-v1.json b/...ernal/schema/org.riotkit.rkd-yaml-v1.json → ...ernal/schema/org.riotkit.rkd-yaml-v1.json
diff --git a/rkd/standardlib/core.py b/rkd/standardlib/core.py
@@ -448,6 +448,9 @@ def execute(self, ctx: ExecutionContext) -> bool:
 
         template_structure_path = os.path.dirname(os.path.realpath(__file__)) + '/../misc/initial-structure'
 
+        if not os.path.isdir(template_structure_path):
+            template_structure_path = '/usr/lib/rkd/initial-structure/'
+
         self.on_startup(ctx)
 
         # 1) Create structure from template

diff --git a/rkd/yaml_parser.py b/rkd/yaml_parser.py
@@ -88,6 +88,7 @@ def get_lookup_paths(self, subdirectory: str) -> List[str]:
         for path in global_paths:
             paths.append(path + '/' + subdirectory)
 
-        paths.append(CURRENT_SCRIPT_PATH + '/internal/' + subdirectory)
+        paths.append(CURRENT_SCRIPT_PATH + '/misc/internal/' + subdirectory)
+        paths.append('/usr/share/rkd/internal')
 
         return list(dict.fromkeys(paths))
diff --git a/setup.cfg b/setup.cfg
@@ -21,6 +21,7 @@ keywords =
     distutils
 
 [files]
+data-files = /usr/share/rkd = ./rkd/misc/*
 packages_root = ./
 packages =
     rkd

diff --git a/test/test_context.py b/test/test_context.py
@@ -25,7 +25,7 @@ def test_loads_internal_context(self) -> None:
         """Test if internal context (RKD by default has internal context) is loaded properly
         """
         discovery = ContextFactory(NullSystemIO())
-        ctx = discovery._load_context_from_directory(CURRENT_SCRIPT_PATH + '/../rkd/internal')
+        ctx = discovery._load_context_from_directory(CURRENT_SCRIPT_PATH + '/../rkd/misc/internal')
 
         self.assertTrue(isinstance(ctx, ApplicationContext))