Split off more Debian-related tasks into 'debian.sh'

debian.sh

@@ -9,7 +9,28 @@ source \
 	"${baseDir}/system.conf"
 
 
-if [[ "${1}" == '--mmdebstrap' ]]; then
+if [[ "${1}" == '--live' ]]; then
+	if [[ ! "$(hostname)" == "debian-live" ]]; then
+		cat << EOF | tee /etc/apt/sources.list.d/contrib.sources 1> /dev/null
+Enabled:		yes
+Types:			deb
+URIs:			http://deb.debian.org/debian/
+Suites:			${VERSION_CODENAME}
+Components:		contrib
+Signed-By:		/usr/share/keyrings/debian-archive-keyring.gpg
+EOF
+	fi
+
+	apt \
+		--update \
+		install \
+		--yes \
+		mmdebstrap \
+		gdisk \
+		systemd-timesyncd \
+		whois \
+		zfsutils-linux
+elif [[ "${1}" == '--mmdebstrap' ]]; then
 	packages=(\
 console-setup \
 cryptsetup \
@@ -86,4 +107,73 @@ Signed-By:		/usr/share/keyrings/debian-archive-keyring.gpg
 EOF
 
 	rm /mnt/etc/apt/sources.list
+elif [[ "${1}" == '--dpkg-reconfigure' ]]; then
+	cat << EOF
+
+Regardless of the language(s) you choose, be sure to enable 'en_US.UTF-8'!
+Press any key to continue...
+EOF
+
+	read -srn 1
+
+	dpkg-reconfigure \
+		locales \
+		tzdata \
+		keyboard-configuration \
+		console-setup
+elif [[ "${1}" == '--purge-os-prober' ]]; then
+	apt \
+		purge \
+		--yes \
+		os-prober
+elif [[ "${1}" == '--network-manager' ]]; then
+	cp \
+		/etc/NetworkManager/NetworkManager.conf \
+		/etc/NetworkManager/NetworkManager.conf.orig
+
+	cat \
+		/etc/NetworkManager/NetworkManager.conf.orig | \
+		sed 's|managed=false|managed=true|' | \
+		tee /etc/NetworkManager/NetworkManager.conf &> /dev/null
+elif [[ "${1}" == '--contrib' ]]; then
+	cat << EOF | tee --append /etc/apt/sources.list.d/${VERSION_CODENAME}.sources &> /dev/null
+
+# ${VERSION_CODENAME^} Backports
+Enabled:		yes
+Types:			deb deb-src
+URIs:			http://deb.debian.org/debian/
+Suites:			${VERSION_CODENAME}-backports
+Components:		main non-free-firmware contrib
+Signed-By:		/usr/share/keyrings/debian-archive-keyring.gpg
+EOF
+
+	cat << EOF | tee /etc/apt/preferences.d/backports.pref &> /dev/null
+Package:		*
+Pin:			release	n=${VERSION_CODENAME}*
+Pin-Priority:	990
+
+Package:		linux-*
+Pin:			release	n=${VERSION_CODENAME}-backports
+Pin-Priority:	-1
+EOF
+
+	if [[ "${VERSION_CODENAME}" == 'bookworm' ]]; then
+	cat << EOF | tee --append /etc/apt/preferences.d/backports.pref &> /dev/null
+
+Package: /wayland/
+Pin: release n=${VERSION_CODENAME}-backports
+Pin-Priority: -1
+EOF
+	fi
+elif [[ "${1}" == '--tasksel' ]]; then
+	if [[ ! -f /usr/bin/tasksel ]]; then
+		apt \
+			--update \
+			install \
+			--yes \
+			tasksel
+	fi
+
+	tasksel \
+		--new-install
 fi

install.sh

@@ -112,19 +112,7 @@ if [[ "${ID}" == 'fedora' ]]; then
 fi
 
 if [[ "${ID}" == 'debian' ]] || [[ "${ID}" == 'elementary' ]]; then
-	cat << EOF
+	"${baseDir}/debian.sh" --dpkg-reconfigure
-
-Regardless of the language(s) you choose, be sure to enable 'en_US.UTF-8'!
-Press any key to continue...
-EOF
-
-	read -srn 1
-
-	dpkg-reconfigure \
-		locales \
-		tzdata \
-		keyboard-configuration \
-		console-setup
 fi
 
 if [[ "${ID}" == 'debian' ]]; then
@@ -155,10 +143,7 @@ mount \
 	/boot/efi
 
 if [[ "${ID}" == 'debian' ]] || [[ "${ID}" == 'elementary' ]]; then
-	apt \
+	"${baseDir}/debian.sh" --purge-os-prober
-		purge \
-		--yes \
-		os-prober
 fi
 
 printf \
@@ -185,14 +170,7 @@ if [[ "${enableSwap}" == "yes" ]]; then
 fi
 
 if [[ "${ID}" == 'debian' ]]; then
-	cp \
+	"${baseDir}/debian.sh" --network-manager
-		/etc/NetworkManager/NetworkManager.conf \
-		/etc/NetworkManager/NetworkManager.conf.orig
-
-	cat \
-		/etc/NetworkManager/NetworkManager.conf.orig | \
-		sed 's|managed=false|managed=true|' | \
-		tee /etc/NetworkManager/NetworkManager.conf &> /dev/null
 fi
 
 if [[ "${ID}" == 'debian' ]] || [[ "${ID}" == 'elementary' ]]; then

post-inst.sh

@@ -120,35 +120,7 @@ Pin: release n=${UBUNTU_VERSION_CODENAME}-backports
 Pin-Priority: -1
 EOF
 elif [[ "${ID}" == 'debian' ]]; then
-	cat << EOF | tee --append /etc/apt/sources.list.d/${VERSION_CODENAME}.sources &> /dev/null
+	"${baseDir}/debian.sh" --contrib
-
-# ${VERSION_CODENAME^} Backports
-Enabled:		yes
-Types:			deb deb-src
-URIs:			http://deb.debian.org/debian/
-Suites:			${VERSION_CODENAME}-backports
-Components:		main non-free-firmware contrib
-Signed-By:		/usr/share/keyrings/debian-archive-keyring.gpg
-EOF
-
-	cat << EOF | tee /etc/apt/preferences.d/backports.pref &> /dev/null
-Package:		*
-Pin:			release	n=${VERSION_CODENAME}*
-Pin-Priority:	990
-
-Package:		linux-*
-Pin:			release	n=${VERSION_CODENAME}-backports
-Pin-Priority:	-1
-EOF
-
-	if [[ "${VERSION_CODENAME}" == 'bookworm' ]]; then
-	cat << EOF | tee --append /etc/apt/preferences.d/backports.pref &> /dev/null
-
-Package: /wayland/
-Pin: release n=${VERSION_CODENAME}-backports
-Pin-Priority: -1
-EOF
-	fi
 fi
 
 if [[ "${ID}" == 'debian' ]] || [[ "${ID}" == 'elementary' ]]; then
@@ -164,15 +136,7 @@ if [[ "${ID}" == 'elementary' ]]; then
 		--autoremove \
 		elementary-desktop
 elif [[ "${ID}" = 'debian' ]]; then
-	if [[ ! -f /usr/bin/tasksel ]]; then
+	"${baseDir}/debian.sh" --tasksel
-		apt \
-			install \
-			--yes \
-			tasksel
-	fi
-
-	tasksel \
-		--new-install
 fi
 
 if [[ "${ID}" == 'debian' ]] || [[ "${ID}" == 'elementary' ]]; then

pre-inst.sh

@@ -31,20 +31,6 @@ source \
 	"${baseDir}/system.conf"
 
 
-if [[ "${ID}" == 'debian' ]]; then
-	if [[ ! "$(hostname)" == "debian-live" ]]; then
-		cat << EOF | tee /etc/apt/sources.list.d/contrib.sources 1> /dev/null
-Enabled:		yes
-Types:			deb
-URIs:			http://deb.debian.org/debian/
-Suites:			${VERSION_CODENAME}
-Components:		contrib
-Signed-By:		/usr/share/keyrings/debian-archive-keyring.gpg
-EOF
-	fi
-fi
-
-
 if [[ -f '/usr/bin/gsettings' ]]; then
 	gsettings \
 		set \
@@ -54,16 +40,7 @@ if [[ -f '/usr/bin/gsettings' ]]; then
 fi
 
 if [[ "${ID}" == 'debian' ]] || [[ "${ID}" == 'elementary' ]]; then
-	apt \
+	"${baseDir}/debian.sh" --live
-		update && \
-	apt \
-		install \
-		--yes \
-		mmdebstrap \
-		gdisk \
-		systemd-timesyncd \
-		whois \
-		zfsutils-linux
 elif [[ "${ID}" == 'fedora' ]]; then
 	if [[ "${VERSION_ID}" -lt '41' ]]; then
 		dnf config-manager \