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

Removed AUR support (Moving to a separate project, possibly as an addon layer later)

This commit is contained in:
Anton Hvornum 2020-09-29 21:01:10 +00:00
parent 008ecf00a1
commit 6338e7116e
4 changed files with 2 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -77,8 +77,6 @@ with archinstall.Filesystem(harddrive, archinstall.GPT) as fs:
installation.user_create('anton', 'test') installation.user_create('anton', 'test')
installation.user_set_pw('root', 'toor') installation.user_set_pw('root', 'toor')
installation.add_AUR_support()
``` ```
This installer will perform the following: This installer will perform the following:

36
archinstall/lib/installer.py
View File

@ -251,39 +251,3 @@ class Installer():
vconsole.write(f'KEYMAP={language}\n') vconsole.write(f'KEYMAP={language}\n')
vconsole.write(f'FONT=lat9w-16\n') vconsole.write(f'FONT=lat9w-16\n')
return True return True
def add_AUR_support(self):
log(f'Building and installing yay support into {self.mountpoint}')
self.add_additional_packages(['git', 'base-devel']) # TODO: Remove if not explicitly added at one point
o = b''.join(sys_command(f'/usr/bin/arch-chroot {self.mountpoint} sh -c "useradd -m -G wheel aibuilder"'))
o = b''.join(sys_command(f"/usr/bin/sed -i 's/# %wheel ALL=(ALL) NO/%wheel ALL=(ALL) NO/' {self.mountpoint}/etc/sudoers"))
o = b''.join(sys_command(f'/usr/bin/arch-chroot {self.mountpoint} sh -c "su - aibuilder -c \\"(cd /home/aibuilder; git clone https://aur.archlinux.org/yay.git)\\""'))
o = b''.join(sys_command(f'/usr/bin/arch-chroot {self.mountpoint} sh -c "chown -R aibuilder.aibuilder /home/aibuilder/yay"'))
log(f'Building and installing yay.')
o = b''.join(sys_command(f'/usr/bin/arch-chroot {self.mountpoint} sh -c "su - aibuilder -c \\"(cd /home/aibuilder/yay; makepkg -si --noconfirm)\\" >/dev/null"'))
o = b''.join(sys_command(f'/usr/bin/arch-chroot {self.mountpoint} sh -c "userdel aibuilder; rm -rf /hoem/aibuilder"'))
o = b''.join(sys_command(f"/usr/bin/sed -i 's/^%wheel ALL=(ALL) NO/# %wheel ALL=(ALL) NO/' {self.mountpoint}/etc/sudoers"))
def yay(self, *packages, **kwargs):
if type(packages[0]) in (list, tuple): packages = packages[0]
log(f'Installing AUR packages: {packages}')
if (sync_mirrors := sys_command('/usr/bin/pacman -Syy')).exit_code == 0:
o = b''.join(sys_command(f'/usr/bin/arch-chroot {self.mountpoint} sh -c "useradd -m -G wheel aibuilder"'))
o = b''.join(sys_command(f"/usr/bin/sed -i 's/# %wheel ALL=(ALL) NO/%wheel ALL=(ALL) NO/' {self.mountpoint}/etc/sudoers"))
o = b''.join(sys_command(f'/usr/bin/arch-chroot {self.mountpoint} sh -c "su - aibuilder -c \\"/usr/bin/yay -S --noconfirm {" ".join(packages)}\\" >/dev/null"'))
o = b''.join(sys_command(f'/usr/bin/arch-chroot {self.mountpoint} sh -c "userdel aibuilder; rm -rf /hoem/aibuilder"'))
o = b''.join(sys_command(f"/usr/bin/sed -i 's/^%wheel ALL=(ALL) NO/# %wheel ALL=(ALL) NO/' {self.mountpoint}/etc/sudoers"))
return True
else:
log(f'Could not sync mirrors: {sync_mirrors.exit_code}')
def add_AUR_packages(self, *packages):
return self.yay(*packages)

2
examples/minimal.py
View File

@ -28,5 +28,3 @@ with archinstall.Filesystem(harddrive, archinstall.GPT) as fs:
installation.user_create('anton', 'test') installation.user_create('anton', 'test')
installation.user_set_pw('root', 'toor') installation.user_set_pw('root', 'toor')
installation.add_AUR_support()

2
profiles/52-54-00-12-34-56.py
View File

@ -32,8 +32,6 @@ with archinstall.Filesystem(harddrive, archinstall.GPT) as fs:
installation.user_create('anton', 'test') installation.user_create('anton', 'test')
installation.user_set_pw('root', 'toor') installation.user_set_pw('root', 'toor')
installation.add_AUR_support()
repo = git.Repo('./') repo = git.Repo('./')
commit = repo.head.commit.hexsha[:7] commit = repo.head.commit.hexsha[:7]