Tweak the setup scripts, installer and some other minor bits. Vulkan package was also renamed, causing issues

7 files changed, 30 insertions, 8 deletions

diff --git a/.gitignore b/.gitignore
index 57c8425..b9a33d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ out_dir/*
 pkgrepo/*
 pkgs/*
 archiso_config/airootfs/home/live/install.sh
+archiso_config/airootfs/home/pkgrepo/*
diff --git a/archiso_config/airootfs/home/live/.keep b/archiso_config/airootfs/home/live/.keep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/archiso_config/airootfs/home/live/.keep
diff --git a/installer/run.sh b/installer/run.sh
index 97601d8..f6c2af6 100644
--- a/installer/run.sh
+++ b/installer/run.sh
@@ -530,9 +530,9 @@ case $(lspci | grep VGA) in
 		do_chroot pacman -S --needed rocm-opencl-runtime
 	;;
 	*Intel*)
-		# OpenCL Drivers
+		# OpenCL & Vulkan Drivers
 		do_chroot pacman -S --needed \
-			intel-compute-runtime intel-media-driver libva-utils vulkan-intel vulkan-mesa
+			intel-compute-runtime intel-media-driver libva-utils vulkan-intel vulkan-mesa-layers
 	;;
     *)
 		echo "No GPU detected"
@@ -591,12 +591,21 @@ if [ "$(id -u)" -ne 0 ] ; then
 	exit 1
 fi
 cp /boot/limine.conf /boot/limine.conf.install
-snapper -c root create-config /
+
+# Snapper is automatically setup, it seems, so this can be skipped
+# here for now, but if for some reason it isn not now you know what command to
+# run
+# snapper -c root create-config /
+
 limine-update
 limine-snapper-sync
 
 ' > "${_install_path}"/home/"${_username}"/setup.sh
 
-echo "${_green}Install complete! Rebooting!"
-sleep 10
+echo "${_green}Install complete!"
+echo ""
+echo "${_green}Make sure you run the 'setup.sh' script after first boot."
+echo ""
+echo "${_green}Rebooting!"
+sleep 15 
 reboot
diff --git a/mkiso.sh b/mkiso.sh
index b747ff8..7d7e2be 100755
--- a/mkiso.sh
+++ b/mkiso.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 set -ex
+pacman -Q archiso >/dev/null 2>&1 || pacman -S --needed archiso
 sudo rm -rf ./work_dir ./out_dir || echo ""
 cp -f installer/run.sh archiso_config/airootfs/home/live/install.sh
 sudo mkarchiso -w ./work_dir -o ./out_dir ./archiso_config
diff --git a/mkrepo.sh b/mkrepo.sh
index e35231e..38f0cb5 100755
--- a/mkrepo.sh
+++ b/mkrepo.sh
@@ -4,7 +4,7 @@ mkdir -p ./pkgrepo
 #shellcheck disable=SC2155
 export PKGDEST="$(pwd)"/pkgrepo
 if ! [ -L /tmp/arch_pkgrepo ] ; then
-	ln -s "$(pwd)"/pkgrepo /tmp/arch_pkgrepo
+	ln -s "$PKGDEST" /tmp/arch_pkgrepo
 fi
 
 
diff --git a/readme.md b/readme.md
index 84684e8..4a87df8 100644
--- a/readme.md
+++ b/readme.md
@@ -8,12 +8,16 @@ Really, it's just an install script and ISO with some extra flair
 From the base of the repository:
 
 ```bash
+$ ./setup.sh
 $ ./mkrepo.sh
 $ sudo ./mkiso.sh
 ```
 
-Note, you may wish to clean your pacman cache (`pacman -Scc`) if you want it to
-skip downloading packages from upstream mirrors. 
+To clean up all old files and run a completely fresh build:
+
+```
+$ git clean -fdx .
+```
 
 ## Installing from the ISO
 
diff --git a/setup.sh b/setup.sh
new file mode 100755
index 0000000..8576073
--- /dev/null
+++ b/setup.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+# Ensure our cache is up to date and the package cache is empty
+sudo pacman -Syy
+printf "\033[1;31mYou want to remove all cached packages to bake them into
+the ISO properly\nThat is, press 'y' and hit enter.
+Keeping old repos is fine.\033[0m\n"
+sudo pacman -Scc