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 12:34:22 +0000
committerAnton Hvornum <anton.feeds+github@gmail.com>2020-07-08 12:34:22 +0000
commit027f6695bf08f3febf6ad51cd916b24bdb3732d4 (patch)
treef9523f72ee1fb74788e58a92dd229e060a6bfc9f
parentaecd333ea3020c0c575948763089cc829c36c56d (diff)
Adding symlink to examples.
-rw-r--r--README.md9
l---------archinstall/examples1
-rwxr-xr-xmake.sh5
-rw-r--r--setup.py12
-rwxr-xr-xtest.sh6
5 files changed, 29 insertions, 4 deletions
diff --git a/README.md b/README.md
index 42076f88..19869848 100644
--- a/README.md
+++ b/README.md
@@ -100,6 +100,15 @@ This will create a *5GB* `testimage.img` and create a loop device which we can u
`archinstall` is installed and executed in [guided mode](#docs-todo). Once the installation is complete,<br>
~~you can use qemu/kvm to boot the test media.~~ *(You'd actually need to do some EFI magic in order to point the EFI vars to the partition 0 in the test medium so this won't work entirely out of the box, but gives you a general idea of what we're going for here)*
+You can also run a pre-built ISO with pip and python
+
+ # qemu-system-x86_64 -enable-kvm -cdrom /home/user/Downloads/archlinux-2020.07.08-x86_64.iso -machine q35,accel=kvm -device intel-iommu -cpu host -m 4096 -boot order=d -drive file=./testimage.img,format=raw -drive if=pflash,format=raw,readonly,file=/usr/share/ovmf/x64/OVMF_CODE.fd -drive if=pflash,format=raw,readonly,file=/usr/share/ovmf/x64/OVMF_VARS.fd
+
+and once inside, just do
+
+ # pip install archlinux
+ # python -m archlinux guided
+
## End note
![description](https://github.com/Torxed/archinstall/raw/master/docs/description.jpg)
diff --git a/archinstall/examples b/archinstall/examples
new file mode 120000
index 00000000..785887f7
--- /dev/null
+++ b/archinstall/examples
@@ -0,0 +1 @@
+../examples/ \ No newline at end of file
diff --git a/make.sh b/make.sh
new file mode 100755
index 00000000..379cd492
--- /dev/null
+++ b/make.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+rm -rf archinstall.egg-info/ build/ dist/
+python3 setup.py sdist bdist_wheel
+
+echo 'python3 -m twine upload dist/*'
diff --git a/setup.py b/setup.py
index 8e7b2f96..ddd35cdf 100644
--- a/setup.py
+++ b/setup.py
@@ -1,11 +1,13 @@
-import setuptools, glob
+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.2",
+ version="2.0.3rc5",
author="Anton Hvornum",
author_email="anton@hvornum.se",
description="Arch Linux installer - guided, templates etc.",
@@ -19,5 +21,7 @@ setuptools.setup(
"Operating System :: POSIX :: Linux",
],
python_requires='>=3.8',
- data_files=[('examples', glob.glob('examples/*.py'))],
-) \ No newline at end of file
+ package_data={'archinstall': glob.glob('examples/*.py')},
+)
+
+#shutil.rmtree('archinstall/examples') \ No newline at end of file
diff --git a/test.sh b/test.sh
new file mode 100755
index 00000000..011a1f9b
--- /dev/null
+++ b/test.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+rm -rf archinstall.egg-info/ build/ dist/
+python3 setup.py sdist bdist_wheel
+sudo pip install --upgrade dist/*.whl
+ls -l /usr/lib/python3.8/site-packages/archinstall
+#echo 'python3 -m twine upload dist/*'