debian: fix building rootfs

termux · Jan 31, 2024 · 6b0f692 · 6b0f692
1 parent 3e37b84
commit 6b0f692
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/distro-build/debian-oldstable.sh b/distro-build/debian-oldstable.sh
@@ -4,20 +4,20 @@ dist_name="Debian"
 dist_version="bullseye"
 
 bootstrap_distribution() {
-	sudo rm -f "${ROOTFS_DIR}"/debian-*.tar.xz
+	sudo rm -f "${ROOTFS_DIR}"/debian-"${dist_version}"-*.tar.xz
 
 	for arch in arm64 armhf i386 amd64; do
-		sudo rm -rf "${WORKDIR}/debian-$(translate_arch "$arch")"
+		sudo rm -rf "${WORKDIR}/debian-${dist_version}-$(translate_arch "$arch")"
 		sudo mmdebstrap \
 			--architectures=${arch} \
 			--variant=minbase \
 			--components="main,contrib" \
 			--include="ca-certificates,locales" \
 			--format=directory \
 			"${dist_version}" \
-			"${WORKDIR}/debian-$(translate_arch "$arch")"
-		archive_rootfs "${ROOTFS_DIR}/debian-$(translate_arch "$arch")-pd-${CURRENT_VERSION}.tar.xz" \
-			"debian-$(translate_arch "$arch")"
+			"${WORKDIR}/debian-${dist_version}-$(translate_arch "$arch")"
+		archive_rootfs "${ROOTFS_DIR}/debian-${dist_version}-$(translate_arch "$arch")-pd-${CURRENT_VERSION}.tar.xz" \
+			"debian-${dist_version}-$(translate_arch "$arch")"
 	done
 	unset arch
 }

diff --git a/distro-build/debian.sh b/distro-build/debian.sh
@@ -4,20 +4,20 @@ dist_name="Debian"
 dist_version="bookworm"
 
 bootstrap_distribution() {
-	sudo rm -f "${ROOTFS_DIR}"/debian-*.tar.xz
+	sudo rm -f "${ROOTFS_DIR}"/debian-"${dist_version}"-*.tar.xz
 
 	for arch in arm64 armhf i386 amd64; do
-		sudo rm -rf "${WORKDIR}/debian-$(translate_arch "$arch")"
+		sudo rm -rf "${WORKDIR}/debian-${dist_version}-$(translate_arch "$arch")"
 		sudo mmdebstrap \
 			--architectures=${arch} \
 			--variant=minbase \
 			--components="main,contrib" \
 			--include="ca-certificates,locales" \
 			--format=directory \
 			"${dist_version}" \
-			"${WORKDIR}/debian-$(translate_arch "$arch")"
-		archive_rootfs "${ROOTFS_DIR}/debian-$(translate_arch "$arch")-pd-${CURRENT_VERSION}.tar.xz" \
-			"debian-$(translate_arch "$arch")"
+			"${WORKDIR}/debian-${dist_version}-$(translate_arch "$arch")"
+		archive_rootfs "${ROOTFS_DIR}/debian-${dist_version}-$(translate_arch "$arch")-pd-${CURRENT_VERSION}.tar.xz" \
+			"debian-${dist_version}-$(translate_arch "$arch")"
 	done
 	unset arch
 }