Condensed 3 seperate [rsync] commands into single for loop

debian/live.sh

@@ -22,7 +22,8 @@ apt \
 	--yes \
 	mmdebstrap \
 	gdisk \
-	linux-headers-generic \
+	linux-headers-$(uname -r) \
 	systemd-timesyncd \
+	wget \
 	whois \
 	zfsutils-linux

debian/mmdebstrap.sh

@@ -9,7 +9,6 @@ packages=( \
 ca-certificates \
 console-setup \
 cryptsetup \
-curl \
 dosfstools \
 dpkg-dev \
 efibootmgr \
@@ -28,14 +27,15 @@ rsync \
 sudo \
 systemd-timesyncd \
 tasksel \
+wget \
 zfs-initramfs \
 zstd \
 )
 
-include="--include=${packages[0]}"
+include="${packages[0]}"
 
 for ((i=1;i<${#packages[@]};i++)); do
-	include+=" --include=${packages[${i}]}"
+	include+=",${packages[${i}]}"
 done
 
 mmdebstrap \
@@ -43,6 +43,6 @@ mmdebstrap \
 	--components=main,non-free-firmware,contrib \
 	--mode=root \
 	--format=directory \
-	${include} \
+	--include="${include}" \
 	"${VERSION_CODENAME}" \
 	/mnt

efi.sh

@@ -17,34 +17,19 @@ mkdir \
 	-p \
 	/boot/efi/EFI/BOOT
 
-curl \
+wget \
-	--progress-bar \
+	--output-document \
-	--show-error \
-	--output \
 	/boot/efi/EFI/ZBM/VMLINUZ.EFI \
-	--location \
 	https://get.zfsbootmenu.org/efi
 
-rsync \
+for file in {ZBM/VMLINUZ-BACKUP,BOOT/{BOOTX64,shellx64}}; do
+	rsync \
 		-pogAXtlHrDx \
 		--stats \
 		--info=progress2 \
 		/boot/efi/EFI/ZBM/VMLINUZ.EFI \
-	/boot/efi/EFI/ZBM/VMLINUZ-BACKUP.EFI
+		/boot/efi/EFI/${file}.EFI
-
+done
-rsync \
-	-pogAXtlHrDx \
-	--stats \
-	--info=progress2 \
-	/boot/efi/EFI/ZBM/VMLINUZ.EFI \
-	/boot/efi/EFI/BOOT/BOOTX64.EFI
-
-rsync \
-	-pogAXtlHrDx \
-	--stats \
-	--info=progress2 \
-	/boot/efi/EFI/ZBM/VMLINUZ.EFI \
-	/boot/efi/EFI/BOOT/shellx64.efi
 
 efibootmgr \
 	-c \

elementary.sh

@@ -13,7 +13,6 @@ if [[ "${1}" == '--mmdebstrap' ]]; then
 	packages=(\
 console-setup \
 cryptsetup \
-curl \
 dosfstools \
 dpkg-dev \
 efibootmgr \
@@ -27,14 +26,15 @@ network-manager \
 openssh-{client,server} \
 popularity-contest \
 rsync \
+wget \
 zfs-initramfs \
 zstd\
 )
 
-	include="--include=${packages[0]}"
+	include="${packages[0]}"
 
 	for ((i=1;i<${#packages[@]};i++)); do
-		include+=" --include=${packages[${i}]}"
+		include+=",${packages[${i}]}"
 	done
 
 	mmdebstrap \
@@ -42,7 +42,7 @@ zstd\
 		--components=main,restricted,universe,multiverse \
 		--mode=root \
 		--format=directory \
-		${include} \
+		--include=${include} \
 		"${UBUNTU_VERSION_CODENAME}" \
 		/mnt
 fi
@@ -170,12 +170,9 @@ if [[ "${1}" == '--desktop' ]]; then
 fi
 
 if [[ "${1}" == '--namarupa' ]]; then
-	curl \
+	wget \
-		--progress \
+		--continue \
-		--location \
+		--directory-prefix '/tmp' \
-		--remote-name \
-		--continue-at - \
-		--output-dir '/tmp' \
 		'https://github.com/lenemter/wingpanel-indicator-namarupa/raw/main/com.github.lenemter.wingpanel-indicator-namarupa.deb'
 
 	apt \