Fix for xorriso usage

1 files changed, 14 insertions, 7 deletions

diff --git a/adelie-build-cd b/adelie-build-cd
index 2f7247c..4b03ea5 100755
--- a/adelie-build-cd
+++ b/adelie-build-cd
@@ -32,27 +32,31 @@ fatal() {
 
 
 ensure_commands() {
-    if ! type apk>/dev/null; then
+    if ! type apk>/dev/null 2>/dev/null; then
         fatal
         printf 'You must have apk installed.  On Gentoo, see sys-devel/apk-tools.\n'
         exit -1
     fi
 
-    if ! type cpio>/dev/null; then
+    if ! type cpio>/dev/null 2>/dev/null; then
         fatal
         printf 'You must have cpio installed.  On Gentoo, see app-arch/cpio.\n'
         exit -1
     fi
 
-    if ! type mksquashfs>/dev/null; then
+    if ! type mksquashfs>/dev/null 2>/dev/null; then
         fatal
         printf 'You must have mksquashfs installed.  On Gentoo, see sys-fs/squashfs-tools.\n'
         exit -1
     fi
 
-    if ! type mkisofs>/dev/null; then
+    if ! type xorriso>/dev/null 2>/dev/null; then
         fatal
-        printf 'You must have mkisofs installed.  Try cdrtools or cdrkit.\n'
+        printf 'You must have xorriso installed:\n\n'
+	printf '* cdrkit (Alpine, Gentoo) will not generate a usable PPC ISO.\n'
+	printf '* wodim (Debian) will not generate a usable PPC64 ISO.\n'
+	printf '* cdrtools (Schily) will overrun the PPC64 ISO and write junk to grubcore.img.\n'
+	printf '\nSorry, but xorriso really is required.\n'
         exit -1
     fi
 }
@@ -295,10 +299,14 @@ prepare_cdroot() {
 }
 
 create_iso() {
+	local CD_VERSION="$VERSION"
 	header 'Creating the CD...'
 
 	declare -r CD_PARAMS=$(cat iso-params-$ARCH)
-	mkisofs -o adelie-${DO_FULL:-live}-$ARCH-$VERSION-$(date +%Y%m%d).iso -joliet -rational-rock -V "Adelie $VERSION $ARCH" ${CD_PARAMS} cdroot-$ARCH
+	CD_VERSION=${CD_VERSION/-alpha/a}
+	CD_VERSION=${CD_VERSION/-beta/b}
+	CD_VERSION=${CD_VERSION/-rc/rc}
+	xorriso -as mkisofs -o adelie-${DO_FULL:-live}-$ARCH-$VERSION-$(date +%Y%m%d).iso -joliet -rational-rock -V "Adelie $CD_VERSION $ARCH" ${CD_PARAMS} cdroot-$ARCH
 }
 
 case $PHASE in
@@ -313,7 +321,6 @@ case $PHASE in
 		make_initrd
 		;;
 	iso)
-		prepare_cdroot
 		create_iso
 		;;
 	all)