RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added some more debugging

This commit is contained in:
Anton Hvornum 2020-11-08 23:12:49 +00:00
parent 5ad6ea26c8
commit 18c811ac96
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
2.0.6rc11 2.0.6rc13

6
archinstall/lib/profiles.py
View File

@ -65,11 +65,13 @@ def find_installation_script(profile):
with open(profile, 'r') as file: with open(profile, 'r') as file:
return Script(file.read(), filename=os.path.basename(profile)) return Script(file.read(), filename=os.path.basename(profile))
except FileNotFoundError: except FileNotFoundError:
return ProfileNotFound(f"File {profile} does not exist") cwd = os.path.abspath(f'{os.path.dirname(__file__)}')
examples = f"{cwd}/examples"
raise ProfileNotFound(f"File {profile} does not exist in {examples}")
elif parsed_url.scheme in ('https', 'http'): elif parsed_url.scheme in ('https', 'http'):
return Script(urllib.request.urlopen(profile).read().decode('utf-8'), filename=os.path.basename(profile)) return Script(urllib.request.urlopen(profile).read().decode('utf-8'), filename=os.path.basename(profile))
else: else:
return ProfileNotFound(f"Cannot handle scheme {parsed_url.scheme}") raise ProfileNotFound(f"Cannot handle scheme {parsed_url.scheme}")
class Imported(): class Imported():

8
make.sh
View File

@ -5,10 +5,10 @@ VERSION=$(cat VERSION)
rm -rf archinstall.egg-info/ build/ src/ pkg/ dist/ archinstall.build/ "archinstall-v${VERSION}-x86_64/" *.pkg.*.xz archinstall-*.tar.gz rm -rf archinstall.egg-info/ build/ src/ pkg/ dist/ archinstall.build/ "archinstall-v${VERSION}-x86_64/" *.pkg.*.xz archinstall-*.tar.gz
nuitka3 --standalone --show-progress archinstall #nuitka3 --standalone --show-progress archinstall
cp -r examples/ archinstall.dist/ #cp -r examples/ archinstall.dist/
mv archinstall.dist "archinstall-v${VERSION}-x86_64" #mv archinstall.dist "archinstall-v${VERSION}-x86_64"
tar -czvf "archinstall-v${VERSION}.tar.gz" "archinstall-v${VERSION}-x86_64" #tar -czvf "archinstall-v${VERSION}.tar.gz" "archinstall-v${VERSION}-x86_64"
# makepkg -f # makepkg -f
python3 setup.py sdist bdist_wheel python3 setup.py sdist bdist_wheel