diff --git a/Makefile b/Makefile index 7d1f44b..27a709a 100644 --- 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 manjarowsl manjarolinux/base:latest /bin/bash -c "pacman-mirrors --fasttrack 5; 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]' | sudo tee -a /etc/pacman.conf >/dev/null 2>&1; echo 'Server = https://pkg.wslutiliti.es/arch/' | sudo tee -a /etc/pacman.conf >/dev/null 2>&1; echo 'export BROWSER="wslview"' | sudo tee -a /etc/skel/.bashrc >/dev/null 2>&1; sed -i 's/#\[multilib\]/\[multilib\]/g' /etc/pacman.conf; sed -i '/\[multilib\]/ { n; s/#Include/Include/; }' /etc/pacman.conf; pacman --noconfirm -Syyu; pacman --noconfirm -Rdd dbus; pacman --noconfirm --needed -Sy aria2 aspell base-devel bc ccache dconf dos2unix figlet git grep hspell hunspell hwdata inetutils iputils iproute2 keychain libxcrypt-compat libvoikko linux-tools lolcat nano ntp nuspell openssh procps socat sudo usbutils vi vim wget wslu xdg-utils xmlto yay yelp-tools; mkdir -p /etc/pacman.d/hooks; echo '%wheel ALL=(ALL) ALL' > /etc/sudoers.d/wheel; pacman -Rdd --noconfirm dbus; useradd -m -g users -G wheel builduser; passwd -d builduser; git clone https://aur.archlinux.org/dbus-x11.git && sudo chown -R builduser dbus-x11 && cd dbus-x11 && sudo -u builduser makepkg -sic --noconfirm && libtool --finish /usr/lib && cd .. && rm -rf dbus-x11; userdel -r builduser; sed -i 's/#en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen && locale-gen; systemd-machine-id-setup; rm /var/lib/dbus/machine-id; dbus-uuidgen --ensure=/etc/machine-id; dbus-uuidgen --ensure; yes | LC_ALL=en_US.UTF-8 pacman -Scc" + docker run --net=host --name manjarowsl manjarolinux/base:latest /bin/bash -c "pacman-mirrors --fasttrack 5; 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]' | sudo tee -a /etc/pacman.conf >/dev/null 2>&1; echo 'Server = https://pkg.wslutiliti.es/arch/' | sudo tee -a /etc/pacman.conf >/dev/null 2>&1; echo 'export BROWSER="wslview"' | sudo tee -a /etc/skel/.bashrc >/dev/null 2>&1; sed -i 's/#\[multilib\]/\[multilib\]/g' /etc/pacman.conf; sed -i '/\[multilib\]/ { n; s/#Include/Include/; }' /etc/pacman.conf; pacman --noconfirm -Syyu; pacman --noconfirm -Rdd dbus; pacman --noconfirm --needed -Sy aria2 aspell base-devel bc ccache dconf dos2unix figlet git grep hspell hunspell hwdata inetutils iputils iproute2 keychain libva-mesa-driver libva-utils libxcrypt-compat libvoikko linux-tools lolcat mesa-vdpau nano ntp nuspell openssh procps socat sudo usbutils vi vim wget wslu xdg-utils xmlto yay yelp-tools; mkdir -p /etc/pacman.d/hooks; echo '%wheel ALL=(ALL) ALL' > /etc/sudoers.d/wheel; pacman -Rdd --noconfirm dbus; useradd -m -g users -G wheel builduser; passwd -d builduser; git clone https://aur.archlinux.org/dbus-x11.git && sudo chown -R builduser dbus-x11 && cd dbus-x11 && sudo -u builduser makepkg -sic --noconfirm && libtool --finish /usr/lib && cd .. && rm -rf dbus-x11; userdel -r builduser; sed -i 's/#en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen && locale-gen; systemd-machine-id-setup; rm /var/lib/dbus/machine-id; dbus-uuidgen --ensure=/etc/machine-id; dbus-uuidgen --ensure; yes | LC_ALL=en_US.UTF-8 pacman -Scc" docker export --output=base.tar manjarowsl docker rm -f manjarowsl