thetumultuousunicornofdarkness / dmg2dir Goto Github PK

First, thanks for this handy piece of software!

Environment:

• Arch Linux, kernel 4.18.5
• bash 4.4.023-1
• cdrtools 3.02a09-1
• udisks2 2.7.7-1
• dmg2dir 3.0.3-1 (from Arch AUR repo).

Issues:

1. premount() check for dev variable fails if no existing disks have labels. In this case, /dev/disk/by-label doesn't exist. It's a legitimate possibility, should be taken into account.
2. convertiso() fails with some of the more imaginative labels.

Example of the above (the disk by label variable check already disabled):

dmg2dir -w -n macOS_10.12.6_Sierra -p /home/user/example/macos_img -t /home/user/example/macos_img_tmp -d /home/user/example/macos_img_src/MacOS_Sierra_v10.12.6_Final/'MacOS_Sierra_v10.12.6_Final[16G29].dmg'

-> List devices labels
ls: cannot access '/dev/disk/by-label': No such file or directory

-> Set up loop-device
Mapped file /home/user/example/macos_img_tmp/macOS_10.12.6_Sierra.img as /dev/loop0.

-> Retrieve loop device name
/dev/loop0

-> Relist devices labels
macOS 10.12.6_(16G29)_[MAS]_MAC-RU.NET

-> Get label from lists differences
macOS 10.12.6_(16G29)_[MAS]_MAC-RU.NET

-> Set application directory
/home/user/example/macos_img/macOS_10.12.6_Sierra

==> Mount block device...
Mounted /dev/loop0p2 at /run/media/user/macOS 10.12.6_(16G29)_[MAS]_MAC-RU.NET.
/run/media/user/macOS0.12.6_(16G29)_[MAS]_MAC-RU.NET

==> Generate ISO file...
genisoimage: Warning: assuming PC Exchange cluster size of 512 bytes
Setting input-charset to 'UTF-8' from locale.
3.02a09 (x86_64-unknown-linux-gnu)
genisoimage: No such file or directory. Invalid node - '/run/media/user/macOS0.12.6_(16G29)_[MAS]_MAC-RU.NET'.
No output file found.
Error 50 has occured.

Note the /run/media/user/macOS0.12.6_(16G29)_[MAS]_MAC-RU.NET that should be /run/media/user/macOS 10.12.6_(16G29)_[MAS]_MAC-RU.NET.

Looks like the $mountpont variable in mountimg() gets the wrong value.

I had to move past it quickly. Hardcoding the correct path in the convertiso() function solves it.

3. convertiso(), genisoimage throws errors if there are files larger than 4GB within the image:

genisoimage: Value too large for defined data type. File /run/media/user/macOS 10.13.6 High Sierra/Install macOS High Sierra.app/Contents/SharedSupport/InstallESD.dmg is too large for current mkisofs settings (-iso-level 3 or more required) - ignoring

Perhaps
$geniso $v -V "$name" -R -probe -g -o "$app_directory.iso" "$mountpoint"
should be something like (untested for actual ISO functionality, but it does get it built):
$geniso $v -V -iso-level 3 -UDF "$name" -R -probe -g -o "$app_directory.iso" "$mountpoint"

4. A nitpick ;) There's a typo in error(), "Error %s has occured." should be "Error %s has occurred."

$ sudo make install
msgfmt po/fr.po -o po/dmg2dir_fr.mo
make: msgfmt: No such file or directory
make: *** [Makefile:14: po] Error 127

That's error.

The udisk commands use 2&>1, presumably to redirect stderr to stdout.

https://github.com/X0rg/dmg2dir/blob/b8340f200744af5769602e2f7bba2cf96050ee23/dmg2dir#L60
https://github.com/X0rg/dmg2dir/blob/b8340f200744af5769602e2f7bba2cf96050ee23/dmg2dir#L63

Should be 2>&1. Current format creates a file called 1 with the contents of stderr.