Moved packages array into relavent if statement

base-debian.sh

@@ -9,7 +9,8 @@ source \
 	"${BASEDIR}/system.conf"
 
 
-packages=(\
+if [[ "${1}" == '-1' ]]; then
+	packages=(\
 console-setup \
 cryptsetup \
 curl \
@@ -33,14 +34,12 @@ zfs-initramfs \
 zstd\
 )
 
+	include="--include=${packages[0]}"
 
-include="--include=${packages[0]}"
+	for ((i=1;i<${#packages[@]};i++)); do
+		include+=" --include=${packages[${i}]}"
+	done
 
-for ((i=1;i<${#packages[@]};i++)); do
-	include+=" --include=${packages[${i}]}"
-done
-
-if [[ "${1}" == '-1' ]]; then
 	mmdebstrap \
 		--skip=check/empty \
 		--components=main,non-free-firmware,contrib \

base-elementary.sh

@@ -9,7 +9,8 @@ source \
 	"${BASEDIR}/system.conf"
 
 
-packages=(\
+if [[ "${1}" == '-1' ]]; then
+	packages=(\
 console-setup \
 cryptsetup \
 curl \
@@ -29,14 +30,12 @@ zfs-initramfs \
 zstd\
 )
 
+	include="--include=${packages[0]}"
 
-include="--include=${packages[0]}"
+	for ((i=1;i<${#packages[@]};i++)); do
+		include+=" --include=${packages[${i}]}"
+	done
 
-for ((i=1;i<${#packages[@]};i++)); do
-	include+=" --include=${packages[${i}]}"
-done
-
-if [[ "${1}" == '-1' ]]; then
 	mmdebstrap \
 		--skip=check/empty \
 		--components=main,restricted,universe,multiverse \

partition.sh

@@ -44,6 +44,10 @@ sgdisk \
 if [[ "${ENABLE_SWAP}" == "yes" ]]; then
 	SWAP_SIZE="$(((($(vmstat -sS M | grep 'total memory' | sed 's/ M total memory//') / 1024) + 1) * 2))"
 
+	if [[ "${SWAP_SIZE#}" -gt '32' ]]; then
+		SWAP_SIZE='32'
+	fi
+
 	sgdisk \
 		-n2:0:+${SWAP_SIZE}G \
 		-t2:BF02 \