Added missing function reboot(). Also tweaked the build scripts so that they fetch a common version from the file VERSION. And some spelling tweaks for the log output.
This commit is contained in:
parent
ba9d5c746f
commit
a2e676261a
|
|
@ -258,3 +258,5 @@ def prerequisit_check():
|
|||
|
||||
return True
|
||||
|
||||
def reboot():
|
||||
o = b''.join(sys_command(("/usr/bin/reboot")))
|
||||
|
|
@ -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
|
||||
|
|
|
|||
4
make.sh
4
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/"
|
||||
|
|
|
|||
5
setup.py
5
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.",
|
||||
|
|
|
|||
Loading…
Reference in New Issue