From df9a67caea9fd9e61d2ae1c45856158b656d5cee Mon Sep 17 00:00:00 2001
From: "Jean (east-high-Nerd)" <jean@easthighnerd.net>
Date: Wed, 31 Dec 2025 23:36:02 -0500
Subject: [PATCH] Broke swap related stuff into seperate script

---
 install.sh | 19 +------------------
 swap.sh    | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 18 deletions(-)
 create mode 100755 swap.sh

diff --git a/install.sh b/install.sh
index a08308f..46fde69 100755
--- a/install.sh
+++ b/install.sh
@@ -29,15 +29,6 @@ source \
 source \
 	"${baseDir}/system.conf"
 
-if [[ ! "${disk}" == **/dev/disk/by-id/** ]]; then
-	if [[ "${disk}" == **/dev/nvme** ]]; then
-		part2='p2'
-	else
-		part2='2'
-	fi
-else
-	part2='-part2'
-fi
 
 if [[ ! -f "/etc/mtab" ]]; then
 	"${baseDir}/mtab.sh"
@@ -137,15 +128,7 @@ passwd
 printf \
 	'\033[?47l'
 
-if [[ "${enableSwap}" == "yes" ]]; then
-	printf \
-		"swap\t${disk}${part2}\t/dev/random\tswap,cipher=aes-xts-plain64,size=512\n" | \
-		tee /etc/crypttab &> /dev/null
-
-	printf \
-		'dev/mapper/swap\tnone\tswap\tsw\t0\t0\n' | \
-		tee --append /etc/fstab &> /dev/null
-fi
+"${baseDir}/swap.sh"
 
 if [[ "${ID}" == 'debian' ]]; then
 	"${baseDir}/debian.sh" --network-manager
diff --git a/swap.sh b/swap.sh
new file mode 100755
index 0000000..793c601
--- /dev/null
+++ b/swap.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+set -euo pipefail
+
+baseDir="$(realpath "$(dirname "${0}")")"
+
+source \
+	"${baseDir}/system.conf"
+
+
+if [[ ! "${disk}" == **/dev/disk/by-id/** ]]; then
+	if [[ "${disk}" == **/dev/nvme** ]]; then
+		part2='p2'
+	else
+		part2='2'
+	fi
+else
+	part2='-part2'
+fi
+
+
+if [[ "${enableSwap}" == "yes" ]]; then
+	printf \
+		"swap\t${disk}${part2}\t/dev/random\tswap,cipher=aes-xts-plain64,size=512\n" | \
+		tee /etc/crypttab &> /dev/null
+
+	printf \
+		'dev/mapper/swap\tnone\tswap\tsw\t0\t0\n' | \
+		tee --append /etc/fstab &> /dev/null
+fi