-URL="http://download.ipfire.org/releases/ipfire-2.x/2.17-core$COREVER/"
-ISO="ipfire-2.17.i586-full-core$COREVER.iso"
+URL="https://downloads.ipfire.org/releases/ipfire-2.x/$IPFVER-core$COREVER/"
+ISO="ipfire-$IPFVER.$arch-full-core$COREVER.iso"
+
+makeiso() {
+ local dir="${1}"
+ local output="${2}"
+
+ local args=
+
+ # Add EFI options when EFI image is present
+ if [ -e "${dir}/boot/isolinux/efiboot.img" ]; then
+ args="${args} -eltorito-alt-boot -e boot/isolinux/efiboot.img -no-emul-boot"
+ fi
+
+ # Compose ISO
+ mkisofs -J -r -V "IPFire ${IPFVER} ${arch}" \
+ -b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \
+ -c boot/isolinux/boot.catalog \
+ ${args} ${dir} > ${output}
+
+ # Add DOS paritition table
+ if [ -e "${dir}/boot/isolinux/efiboot.img" ]; then
+ isohybrid --uefi ${output}
+ else
+ isohybrid ${output}
+ fi
+
+ return 0
+}
+
+case $arch in
+ i?86)
+ arch="i586"
+ echo "Your arch is $arch"
+ ;;
+ x86_64)
+ arch="x86_64"
+ echo "Your arch is $arch"
+ ;;
+ *)
+ echo "Arch is not supported"
+ exit 1
+ ;;
+esac