Provide better error messages from createDiskImage. Check for valid ProDOS filenames. General cleanup of the script.

This commit is contained in:
Jeremy Rand 2021-05-06 23:12:03 -04:00
parent 7d3a33e34c
commit d91cdd32c0
2 changed files with 133 additions and 132 deletions

BIN
.DS_Store vendored

Binary file not shown.

View File

@ -41,8 +41,10 @@ else
CPARGS="--preserve=xattr" CPARGS="--preserve=xattr"
fi fi
cleanupAndExit()
printErrorAndExit()
{ {
echo "`pwd`/Makefile:0:0: error: $*" >&2
umount "$MOUNTDIR" 2> /dev/null umount "$MOUNTDIR" 2> /dev/null
rm -f "$TMPDISKIMAGE" 2> /dev/null rm -f "$TMPDISKIMAGE" 2> /dev/null
rm -f "$TMPBOOTIMAGE" 2> /dev/null rm -f "$TMPBOOTIMAGE" 2> /dev/null
@ -53,84 +55,13 @@ cleanupAndExit()
exit 1 exit 1
} }
if [ ! -f "$TEMPLATEDISKIMAGE" ]
then
echo Unable to find the template disk image, $TEMPLATEDISKIMAGE
cleanupAndExit
fi
if [ ! -f "$TEMPLATEBOOTIMAGE" ]
then
echo Unable to find the template boot image, $TEMPLATEBOOTIMAGE
cleanupAndExit
fi
mkdir "$TMPDIR"
if [ $? != 0 ]
then
echo Unable to create the mount directory.
cleanupAndExit
fi
mkdir "$MOUNTDIR"
if [ $? != 0 ]
then
echo Unable to create the mount directory.
cleanupAndExit
fi
cp "$TEMPLATEBOOTIMAGE" "$TMPBOOTIMAGE"
if [ $? != 0 ]
then
echo Unable to copy template boot image.
cleanupAndExit
fi
if [ ! -z "$COPYBOOTDIRS" ] || [ ! -z "BOOTCOPYPATH" ]
then
profuse -orw "$TMPBOOTIMAGE" "$MOUNTDIR"
if [ $? != 0 ]
then
echo Unable to mount the boot image.
cleanupAndExit
fi
if [ ! -z "$BOOTCOPYPATH" ]
then
cp $CPARGS "$FILE" "$MOUNTDIR/$BOOTCOPYPATH"
if [ $? != 0 ]
then
echo Unable to copy the file to the boot image.
cleanupAndExit
fi
fi
OLDDIR=`pwd`
for COPYDIR in $COPYBOOTDIRS
do
cd "$COPYDIR"
if [ $? != 0 ]
then
echo Unable to find $COPYDIR
cleanupAndExit
fi
find . -print | while read FILEORDIR
do
if [ -d "$FILEORDIR" ]
then
mkdir -p "${MOUNTDIR}/$FILEORDIR"
elif [ -f "$FILEORDIR" ]
then
cp $CPARGS "$FILEORDIR" "${MOUNTDIR}/$FILEORDIR"
fi
done
cd "$OLDDIR"
done
unmount()
{
RETRIES=0 RETRIES=0
while [ $RETRIES -lt 5 ] while [ $RETRIES -lt 5 ]
do do
umount "$MOUNTDIR" umount "$1"
if [ $? -eq 0 ] if [ $? -eq 0 ]
then then
break break
@ -142,102 +73,172 @@ then
if [ $RETRIES -ge 5 ] if [ $RETRIES -ge 5 ]
then then
echo Unable to unmount the boot image. printErrorAndExit "Unable to unmount the disk image."
cleanupAndExit
fi fi
}
validateProDOSName()
{
NAME=`basename $1`
echo $NAME | egrep '^[a-zA-Z][a-zA-Z0-9.]{0,14}$' > /dev/null
}
mkdirProDOS()
{
validateProDOSName "$1"
if [ $? -ne 0 ]
then
printErrorAndExit "Invalid ProDOS name of directory `basename $1`. ProDOS names must be 1 to 15 characters, start with a letter and only letters, numbers and a period can be used in the name."
fi
mkdir -p "$1"
if [ $? -ne 0 ]
then
printErrorAndExit "Unable to create directory $1"
fi
}
cpProDOS()
{
validateProDOSName "$2"
if [ $? -ne 0 ]
then
printErrorAndExit "Invalid ProDOS name of file `basename $2`. ProDOS names must be 1 to 15 characters, start with a letter and only letters, numbers and a period can be used in the name."
fi
cp $CPARGS "$1" "$2"
if [ $? -ne 0 ]
then
printErrorAndExit "Unable to create directory $1"
fi
}
copyDirs()
{
OLDDIR=`pwd`
for COPYDIR in $*
do
cd "$COPYDIR"
if [ $? != 0 ]
then
printErrorAndExit "Unable to find $COPYDIR"
fi
find . -print | while read FILEORDIR
do
if [ -d "$FILEORDIR" ]
then
mkdirProDOS "${MOUNTDIR}/$FILEORDIR"
elif [ -f "$FILEORDIR" ]
then
cpProDOS "$FILEORDIR" "${MOUNTDIR}/$FILEORDIR"
fi
done
cd "$OLDDIR"
done
}
if [ ! -f "$TEMPLATEDISKIMAGE" ]
then
printErrorAndExit "Unable to find the template disk image, $TEMPLATEDISKIMAGE"
fi
if [ ! -f "$TEMPLATEBOOTIMAGE" ]
then
printErrorAndExit "Unable to find the template boot image, $TEMPLATEBOOTIMAGE"
fi
mkdir "$TMPDIR"
if [ $? != 0 ]
then
printErrorAndExit "Unable to create the mount directory."
fi
mkdir "$MOUNTDIR"
if [ $? != 0 ]
then
printErrorAndExit "Unable to create the mount directory."
fi
cp "$TEMPLATEBOOTIMAGE" "$TMPBOOTIMAGE"
if [ $? != 0 ]
then
printErrorAndExit "Unable to copy template boot image."
fi
if [ ! -z "$COPYBOOTDIRS" ] || [ ! -z "BOOTCOPYPATH" ]
then
profuse -orw "$TMPBOOTIMAGE" "$MOUNTDIR"
if [ $? != 0 ]
then
printErrorAndExit "Unable to mount the boot image."
fi
if [ ! -z "$BOOTCOPYPATH" ]
then
cpProDOS "$FILE" "$MOUNTDIR/$BOOTCOPYPATH"
if [ $? != 0 ]
then
printErrorAndExit "Unable to copy the file to the boot image."
fi
fi
copyDirs $COPYBOOTDIRS
unmount "$MOUNTDIR"
fi fi
cp "$TEMPLATEDISKIMAGE" "$TMPDISKIMAGE" cp "$TEMPLATEDISKIMAGE" "$TMPDISKIMAGE"
if [ $? != 0 ] if [ $? != 0 ]
then then
echo Unable to copy template disk image. printErrorAndExit "Unable to copy template disk image."
cleanupAndExit
fi fi
profuse -orw "$TMPDISKIMAGE" "$MOUNTDIR" profuse -orw "$TMPDISKIMAGE" "$MOUNTDIR"
if [ $? != 0 ] if [ $? != 0 ]
then then
echo Unable to mount the disk image. printErrorAndExit "Unable to mount the disk image."
cleanupAndExit
fi fi
cp $CPARGS "$FILE" "$MOUNTDIR" cpProDOS "$FILE" "$MOUNTDIR"
if [ $? != 0 ] if [ $? != 0 ]
then then
echo Unable to copy the file to the disk image. printErrorAndExit "Unable to copy the file to the disk image."
cleanupAndExit
fi fi
copyDirs $COPYDIRS
OLDDIR=`pwd` OLDDIR=`pwd`
for COPYDIR in $COPYDIRS
do
cd "$COPYDIR"
if [ $? != 0 ]
then
echo Unable to find $COPYDIR
cleanupAndExit
fi
find . -print | while read FILEORDIR
do
if [ -d "$FILEORDIR" ]
then
mkdir -p "${MOUNTDIR}/$FILEORDIR"
elif [ -f "$FILEORDIR" ]
then
cp $CPARGS "$FILEORDIR" "${MOUNTDIR}/$FILEORDIR"
fi
done
cd "$OLDDIR"
done
cd "$TMPDIR" cd "$TMPDIR"
$ORCA "$OLDDIR/make/tar" cf "$TMPARCHIVE" "$PROGRAM" $ORCA "$OLDDIR/make/tar" cf "$TMPARCHIVE" "$PROGRAM"
if [ $? != 0 ] if [ $? != 0 ]
then then
echo Unable to create archive. printErrorAndExit "Unable to create archive."
cleanupAndExit
fi fi
cd "$OLDDIR" cd "$OLDDIR"
RETRIES=0 unmount "$MOUNTDIR"
while [ $RETRIES -lt 5 ]
do
umount "$MOUNTDIR"
if [ $? -eq 0 ]
then
break
fi
RETRIES=`expr $RETRIES + 1`
sleep 1
done
if [ $RETRIES -ge 5 ]
then
echo Unable to unmount the disk image.
cleanupAndExit
fi
cp "$TMPDISKIMAGE" "$DISKIMAGE" cp "$TMPDISKIMAGE" "$DISKIMAGE"
if [ $? != 0 ] if [ $? != 0 ]
then then
echo Unable to copy the disk image to the destination. printErrorAndExit "Unable to copy the disk image to the destination."
cleanupAndExit
fi fi
cp "$TMPBOOTIMAGE" "$DESTBOOTIMAGE" cp "$TMPBOOTIMAGE" "$DESTBOOTIMAGE"
if [ $? != 0 ] if [ $? != 0 ]
then then
echo Unable to copy the boot image to the destination. printErrorAndExit "Unable to copy the boot image to the destination."
cleanupAndExit
fi fi
cp "$TMPARCHIVE" "$ARCHIVE" cp "$TMPARCHIVE" "$ARCHIVE"
if [ $? != 0 ] if [ $? != 0 ]
then then
echo Unable to copy the archive to the destination. printErrorAndExit "Unable to copy the archive to the destination."
cleanupAndExit
fi fi
rm -f "$TMPDISKIMAGE" rm -f "$TMPDISKIMAGE"