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-09-29 21:01:10 +0000
committerAnton Hvornum <anton.feeds+github@gmail.com>2020-09-29 21:01:10 +0000
commit6338e7116ef5405cd9b97f066e45a89b7d8e67e7 (patch)
tree9fc6b6f9b9314d2422c3ecbfac9be2be5bc39033
parent008ecf00a161d11163edb2d3236a6cad3d1018fe (diff)
Removed AUR support (Moving to a separate project, possibly as an addon layer later)
-rw-r--r--README.md2
-rw-r--r--archinstall/lib/installer.py38
-rw-r--r--examples/minimal.py4
-rw-r--r--profiles/52-54-00-12-34-56.py2
4 files changed, 2 insertions, 44 deletions
diff --git a/README.md b/README.md
index a840d8da..868cad67 100644
--- a/README.md
+++ b/README.md
@@ -77,8 +77,6 @@ with archinstall.Filesystem(harddrive, archinstall.GPT) as fs:
installation.user_create('anton', 'test')
installation.user_set_pw('root', 'toor')
-
- installation.add_AUR_support()
```
This installer will perform the following:
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index e69f25bf..e6c2e300 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -250,40 +250,4 @@ class Installer():
with open(f'{self.mountpoint}/etc/vconsole.conf', 'w') as vconsole:
vconsole.write(f'KEYMAP={language}\n')
vconsole.write(f'FONT=lat9w-16\n')
- 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) \ No newline at end of file
+ return True \ No newline at end of file
diff --git a/examples/minimal.py b/examples/minimal.py
index c0ccfe20..8bb8ed44 100644
--- a/examples/minimal.py
+++ b/examples/minimal.py
@@ -27,6 +27,4 @@ with archinstall.Filesystem(harddrive, archinstall.GPT) as fs:
installation.install_profile('awesome')
installation.user_create('anton', 'test')
- installation.user_set_pw('root', 'toor')
-
- installation.add_AUR_support() \ No newline at end of file
+ installation.user_set_pw('root', 'toor') \ No newline at end of file
diff --git a/profiles/52-54-00-12-34-56.py b/profiles/52-54-00-12-34-56.py
index 5746746e..49b0b966 100644
--- a/profiles/52-54-00-12-34-56.py
+++ b/profiles/52-54-00-12-34-56.py
@@ -32,8 +32,6 @@ with archinstall.Filesystem(harddrive, archinstall.GPT) as fs:
installation.user_create('anton', 'test')
installation.user_set_pw('root', 'toor')
- installation.add_AUR_support()
-
repo = git.Repo('./')
commit = repo.head.commit.hexsha[:7]