From 53eb58bfb468b36929ba08ae343c1e165fe6a6b3 Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Fri, 4 Dec 2020 02:09:30 -0600
Subject: [PATCH] Oh hey wait we need to install git first

---
 gentoostrap.sh | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/gentoostrap.sh b/gentoostrap.sh
index e1fb0a2..9690896 100755
--- a/gentoostrap.sh
+++ b/gentoostrap.sh
@@ -215,20 +215,6 @@ build-gentoo-chroot() {
 	# Sync repositories
 	log "Getting ebuild repositories"
 	emerge-webrsync
-	log "Configuring gentoo repo"
-	cat <<-EOF > "/etc/portage/repos.conf/gentoo.conf"
-	[DEFAULT]
-	main-repo = gentoo
-
-	[gentoo]
-	location = /usr/portage
-	#sync-depth = 1
-	sync-type = git
-	sync-uri = https://github.com/gentoo-mirror/gentoo.git
-	sync-git-verify-commit-signature = true
-	auto-sync = yes
-	EOF
-	emerge --sync
 
 	# Get the stable plasma/systemd profile and select it
 	profile=$(
@@ -256,6 +242,7 @@ build-gentoo-chroot() {
 	emerge --jobs --quiet-build y \
 		app-admin/sudo \
 		app-editors/vim \
+		dev-vcs/git \
 		sys-boot/grub:2 \
 		sys-fs/{e2fs,xfs}progs \
 		sys-process/cronie
@@ -273,6 +260,21 @@ build-gentoo-chroot() {
 	# Rebuilding modules shouldn't be necessary since the kernel was our last step
 	#emerge --jobs --quiet-build y @module-rebuild
 
+	# Reconfigure repo to clone over git from here on out
+	log "Configuring gentoo repo"
+	cat <<-EOF > "/etc/portage/repos.conf/gentoo.conf"
+	[DEFAULT]
+	main-repo = gentoo
+
+	[gentoo]
+	location = /usr/portage
+	#sync-depth = 1
+	sync-type = git
+	sync-uri = https://github.com/gentoo-mirror/gentoo.git
+	sync-git-verify-commit-signature = true
+	auto-sync = yes
+	EOF
+
 	# Install the bootloader
 	mkdir -p /boot/efi
 	chmod 0700 /boot/efi