Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hvornum <anton.feeds+github@gmail.com>2020-07-08 13:22:05 +0000
committerAnton Hvornum <anton.feeds+github@gmail.com>2020-07-08 13:22:05 +0000
commitfc4790b33c98ca14469e88c00544701a85365d3a (patch)
tree7111ee681dbaa6e0ddee73dfc941bc1855dfa241
parent4f18ac473abef763d6ea2846348da21693d878bd (diff)
Added symlinks instead of copying when building. Also mofied the __file__ path in __main__.py as it was pointing a bit off for some reason
-rw-r--r--.gitignore3
-rw-r--r--archinstall/__main__.py2
l---------archinstall/profiles1
-rw-r--r--setup.py10
4 files changed, 7 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore
index fac1c89b..51a48ec6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ SAFETY_LOCK
**/**pwfile
**/**build
**/**dist
-**/**.egg* \ No newline at end of file
+**/**.egg*
+**/**.sh
diff --git a/archinstall/__main__.py b/archinstall/__main__.py
index 4c619a66..04004674 100644
--- a/archinstall/__main__.py
+++ b/archinstall/__main__.py
@@ -8,7 +8,7 @@ class ProfileNotFound(BaseException):
# (I summon thee dark spawn of cPython)
def find_examples():
- cwd = os.path.abspath(f'{os.path.dirname(__file__)}/../')
+ cwd = os.path.abspath(f'{os.path.dirname(__file__)}')
examples = f"{cwd}/examples"
return {os.path.basename(path): path for path in glob.glob(f'{examples}/*.py')}
diff --git a/archinstall/profiles b/archinstall/profiles
new file mode 120000
index 00000000..c2968eea
--- /dev/null
+++ b/archinstall/profiles
@@ -0,0 +1 @@
+../profiles/ \ No newline at end of file
diff --git a/setup.py b/setup.py
index ddd35cdf..48b928bf 100644
--- a/setup.py
+++ b/setup.py
@@ -3,11 +3,9 @@ import setuptools, glob, shutil
with open("README.md", "r") as fh:
long_description = fh.read()
-#shutil.copytree('examples', 'archinstall/examples')
-
setuptools.setup(
name="archinstall",
- version="2.0.3rc5",
+ version="2.0.3rc6",
author="Anton Hvornum",
author_email="anton@hvornum.se",
description="Arch Linux installer - guided, templates etc.",
@@ -21,7 +19,5 @@ setuptools.setup(
"Operating System :: POSIX :: Linux",
],
python_requires='>=3.8',
- package_data={'archinstall': glob.glob('examples/*.py')},
-)
-
-#shutil.rmtree('archinstall/examples') \ No newline at end of file
+ package_data={'archinstall': glob.glob('examples/*.py') + glob.glob('profiles/*.py')},
+) \ No newline at end of file