Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--VERSION1
-rw-r--r--archinstall/lib/general.py2
-rw-r--r--archinstall/lib/installer.py2
-rwxr-xr-xmake.sh4
-rw-r--r--setup.py5
5 files changed, 10 insertions, 4 deletions
diff --git a/VERSION b/VERSION
new file mode 100644
index 00000000..5986e576
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+2.0.4rc5 \ No newline at end of file
diff --git a/archinstall/lib/general.py b/archinstall/lib/general.py
index 7718f623..e15f9bad 100644
--- a/archinstall/lib/general.py
+++ b/archinstall/lib/general.py
@@ -258,3 +258,5 @@ def prerequisit_check():
return True
+def reboot():
+ o = b''.join(sys_command(("/usr/bin/reboot"))) \ No newline at end of file
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index a6fafb03..5b72ca66 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -92,7 +92,7 @@ class Installer():
return True
def activate_ntp(self):
- log(f'Adding bootloader to {self.boot_partition}')
+ log(f'Installing and activating NTP.')
if self.pacstrap('ntp'):
if self.enable_service('ntpd'):
return True
diff --git a/make.sh b/make.sh
index 30e622f8..d4caeb97 100755
--- a/make.sh
+++ b/make.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# Description: Binary builder for https://archlinux.life/bin/
-VERSION="2.0.4rc4"
+VERSION=$(cat VERSION)
rm -rf archinstall.egg-info/ build/ src/ pkg/ dist/ archinstall.build/ "archinstall-v${VERSION}-x86_64/" *.pkg.*.xz archinstall-*.tar.gz
@@ -12,6 +12,6 @@ tar -czvf "archinstall-v${VERSION}.tar.gz" "archinstall-v${VERSION}-x86_64"
# makepkg -f
# python3 setup.py sdist bdist_wheel
-# echo 'python3 -m twine upload dist/*; rm -rf dist/'
+# echo 'python3 -m twine upload dist/* && rm -rf dist/'
rm -rf archinstall.egg-info/ build/ src/ pkg/ archinstall.build/ "archinstall-v${VERSION}-x86_64/"
diff --git a/setup.py b/setup.py
index 6512bd8c..815376b0 100644
--- a/setup.py
+++ b/setup.py
@@ -3,9 +3,12 @@ import setuptools, glob, shutil
with open("README.md", "r") as fh:
long_description = fh.read()
+with open('VERSION', 'r') as fh:
+ VERSION = fh.read()
+
setuptools.setup(
name="archinstall",
- version="v2.0.4rc4",
+ version=VERSION,
author="Anton Hvornum",
author_email="anton@hvornum.se",
description="Arch Linux installer - guided, templates etc.",