diff options
| author | Andrey Filipenkov <decapitator@ukr.net> | 2020-01-23 00:51:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-23 00:51:48 +0300 |
| commit | 5cd1ad50be78280472ba8c8f4f0f26189261683d (patch) | |
| tree | 98d5d61a28fd4964ac6cc5398137c6bdb31ee79a | |
| parent | b1efb3d81e4f446de568f599c2600ae4a3532535 (diff) | |
| parent | 52c9a5b22455e3cc4950160dee2ade50528b3acd (diff) | |
Merge pull request #17245 from kambala-decapitator/macos-fix-dmg-devhandle
[macos][packaging] fix parsing device handle of a mounted dmg
| -rwxr-xr-x | tools/darwin/packaging/osx/dmgmaker.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/darwin/packaging/osx/dmgmaker.pl b/tools/darwin/packaging/osx/dmgmaker.pl index e728e866d5..c67f33d00f 100755 --- a/tools/darwin/packaging/osx/dmgmaker.pl +++ b/tools/darwin/packaging/osx/dmgmaker.pl @@ -35,7 +35,7 @@ sub make_dmg { `hdiutil create -fs HFS+ -volname "$pkgname" -format UDRW -srcfolder "$mpkg" "$volname.dmg"`; $dev_handle = `hdiutil attach -readwrite -noverify -noautoopen "$volname.dmg" | grep Apple_HFS`; chomp $dev_handle; - $dev_handle = $1 if $dev_handle =~ /^\/dev\/(disk.)/; + $dev_handle = $1 if $dev_handle =~ /^\/dev\/(disk\d+)/; die("Could not obtain device handle\n") if !$dev_handle; print "Got device handle \"$dev_handle\"\n"; #clear the volume - we will copy stuff on it with ditto later |