Cleanup

sileshn · Aug 12, 2022 · 076e5de · 076e5de
1 parent 48fe08c
commit 076e5de
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -46,7 +46,7 @@ rootfs: base.tar
 
 base.tar:
 	@echo -e '\e[1;31mExporting base.tar using docker...\e[m'
-	docker run --net=host --name archwsl archlinux:base-devel /bin/bash -c "pacman --noconfirm --needed -Sy pacman-contrib reflector rsync; reflector --latest 5 --sort rate --save /etc/pacman.d/mirrorlist; pacman-key --init; pacman-key --populate; pacman-key -r A2861ABFD897DD37; pacman-key --lsign-key A2861ABFD897DD37; sed -ibak -e 's/#Color/Color/g' -e 's/CheckSpace/#CheckSpace/g' /etc/pacman.conf; sed -ibak -e 's/IgnorePkg/#IgnorePkg/g' /etc/pacman.conf; echo '[wslutilities]' | tee -a /etc/pacman.conf >/dev/null 2>&1; echo 'Server = https://pkg.wslutiliti.es/arch/' | tee -a /etc/pacman.conf >/dev/null 2>&1; pacman --noconfirm -Syyu; pacman --noconfirm --needed -Sy aria2 aspell autoconf-archive ccache dbus dconf docbook-xsl dos2unix doxygen figlet git grep hspell hunspell inetutils iputils iproute2 keychain libvoikko linux-tools lolcat nano ntp nuspell openssh procps socat sudo usbutils vi vim wget wslu xdg-utils xmlto yelp-tools; mkdir -p /etc/pacman.d/hooks; echo '%wheel ALL=(ALL) ALL' > /etc/sudoers.d/wheel; systemd-machine-id-setup; rm /var/lib/dbus/machine-id; dbus-uuidgen --ensure=/etc/machine-id; dbus-uuidgen --ensure; pacman -Rdd --noconfirm dbus; useradd -m -g users -G wheel builduser; passwd -d builduser; cd /home/builduser && git clone https://aur.archlinux.org/dbus-x11.git && git clone https://aur.archlinux.org/yay-bin.git; sudo chown -R builduser dbus-x11 yay-bin; cd dbus-x11 && sudo -u builduser makepkg -si --noconfirm && libtool --finish /usr/lib; cd /home/builduser/yay-bin && sudo -u builduser makepkg -si --noconfirm; cd && userdel -r builduser; sed -i 's/#en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen && locale-gen; yes | LC_ALL=en_US.UTF-8 pacman -Scc"
+	docker run --net=host --name archwsl archlinux:base-devel /bin/bash -c "pacman --noconfirm --needed -Sy pacman-contrib reflector rsync; reflector --latest 5 --sort rate --save /etc/pacman.d/mirrorlist; pacman-key --init; pacman-key --populate; pacman-key -r A2861ABFD897DD37; pacman-key --lsign-key A2861ABFD897DD37; sed -ibak -e 's/#Color/Color/g' -e 's/CheckSpace/#CheckSpace/g' /etc/pacman.conf; sed -ibak -e 's/IgnorePkg/#IgnorePkg/g' /etc/pacman.conf; echo '[wslutilities]' | tee -a /etc/pacman.conf >/dev/null 2>&1; echo 'Server = https://pkg.wslutiliti.es/arch/' | tee -a /etc/pacman.conf >/dev/null 2>&1; pacman --noconfirm -Syyu; pacman --noconfirm --needed -Sy aria2 aspell autoconf-archive ccache dbus dconf docbook-xsl dos2unix doxygen figlet git grep hspell hunspell inetutils iputils iproute2 keychain libvoikko linux-tools lolcat nano ntp nuspell openssh procps socat sudo usbutils vi vim wget wslu xdg-utils xmlto yelp-tools; mkdir -p /etc/pacman.d/hooks; echo '%wheel ALL=(ALL) ALL' > /etc/sudoers.d/wheel; systemd-machine-id-setup; rm /var/lib/dbus/machine-id; dbus-uuidgen --ensure=/etc/machine-id; dbus-uuidgen --ensure; pacman -Rdd --noconfirm dbus; useradd -m -g users -G wheel builduser; passwd -d builduser; git clone https://aur.archlinux.org/dbus-x11.git /home/builduser/dbus-x11 && git clone https://aur.archlinux.org/yay-bin.git /home/builduser/yay-bin; sudo chown -R builduser /home/builduser/dbus-x11 /home/builduser/yay-bin; cd /home/builduser/dbus-x11 && sudo -u builduser makepkg -si --noconfirm && libtool --finish /usr/lib; cd /home/builduser/yay-bin && sudo -u builduser makepkg -si --noconfirm; cd && userdel -r builduser; sed -i 's/#en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen && locale-gen; yes | LC_ALL=en_US.UTF-8 pacman -Scc"
 	docker export --output=base.tar archwsl
 	docker rm -f archwsl