Initialize pgp keys first

Author: sileshn

Makefile

@@ -49,7 +49,7 @@ rootfs: base.tar
 
 base.tar:
 	@echo -e '\e[1;31mExporting base.tar using docker...\e[m'
-	docker run --net=host --ulimit nofile=1024:10240 --name endeavouroswsl alex5402/endeavouros:latest /bin/bash -c "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; mkdir -p /etc/pacman.d/hooks; touch /etc/pacman.d/hooks/eos-reboot-required.hook; pacman --noconfirm --disable-sandbox --needed -Sy endeavouros-keyring; pacman --noconfirm --disable-sandbox -Syyu; pacman-key --populate; pacman --noconfirm --disable-sandbox --needed -Sy aria2 aspell autoconf-archive base-devel bc ccache dconf dbus dnsutils docbook-xsl dos2unix doxygen figlet git grep hspell hunspell inetutils iputils iproute2 keychain libxcrypt-compat libvoikko linux-tools lolcat man nano ntp nuspell openssh procps socat sudo usbutils vi vim wget xdg-utils xmlto yay yelp-tools; echo '%wheel ALL=(ALL) ALL' > /etc/sudoers.d/wheel; sed -i 's/#en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen && locale-gen; cp /usr/lib/os-release /etc/os-release; 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; mkdir -p /usr/lib/wsl"
+	docker run --net=host --ulimit nofile=1024:10240 --name endeavouroswsl alex5402/endeavouros:latest /bin/bash -c "rm -rf /etc/pacman.d/gnupg; pacman-key --init; pacman-key --populate; 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; mkdir -p /etc/pacman.d/hooks; touch /etc/pacman.d/hooks/eos-reboot-required.hook; pacman --noconfirm --disable-sandbox --needed -Sy endeavouros-keyring archlinux-keyring; pacman --noconfirm --disable-sandbox -Syyu; pacman --noconfirm --disable-sandbox --needed -Sy aria2 aspell autoconf-archive base-devel bc ccache dconf dbus dnsutils docbook-xsl dos2unix doxygen figlet git grep hspell hunspell inetutils iputils iproute2 keychain libxcrypt-compat libvoikko linux-tools lolcat man nano ntp nuspell openssh procps socat sudo usbutils vi vim wget xdg-utils xmlto yay yelp-tools; echo '%wheel ALL=(ALL) ALL' > /etc/sudoers.d/wheel; sed -i 's/#en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen && locale-gen; cp /usr/lib/os-release /etc/os-release; 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; mkdir -p /usr/lib/wsl"
 	docker export --output=base.tar endeavouroswsl
 	docker rm -f endeavouroswsl
 

bash_profile

@@ -16,7 +16,7 @@ echo -e "\033[33;7mDo not interrupt or close the terminal window till script fin
 echo -e ${grn}"Initializing and populating keyring..."${txtrst}
 pacman-key --init >/dev/null 2>&1
 pacman-key --populate >/dev/null 2>&1
-pacman -Sy archlinux-keyring --noconfirm >/dev/null 2>&1
+pacman --noconfirm --needed -Sy archlinux-keyring endeavouros-keyring >/dev/null 2>&1
 setcap cap_net_raw+p /usr/sbin/ping
 sed -i '/PS1/d' /etc/skel/.bashrc
 echo "PS1='\[\033[01;32m\][\u@\h\[\033[01;37m\] \W\[\033[01;32m\]]\$\[\033[00m\] '" | tee -a /etc/skel/.bashrc >/dev/null 2>&1