diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-07-27 13:30:44 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-07-27 20:32:00 +0000 |
| commit | dacf6e4d87f168568cc0fe364c7862c5686a997b (patch) | |
| tree | d35452ed8547912463cb4b280699364960d2f40d /macosx-setup.sh | |
| parent | 5b1106d1afb517428230206f7b0334a190f8c146 (diff) | |
Don't fail if unmounting the CMake disk image fails.
I don't know why, but sometimes it fails - the most recent failure was
due to it having already been unmounted! Maybe the CMake installer
unmounts it some times but not others. Just drive on if it fails.
Change-Id: I1b31356f08695b8d3b9e425f8475a422e1da0783
Reviewed-on: https://code.wireshark.org/review/3220
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'macosx-setup.sh')
| -rwxr-xr-x | macosx-setup.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/macosx-setup.sh b/macosx-setup.sh index 3f304ebf1a..9beff19be2 100755 --- a/macosx-setup.sh +++ b/macosx-setup.sh @@ -794,7 +794,7 @@ if [ -n "$CMAKE" -a ! -f cmake-$CMAKE_VERSION-done ]; then [ -f cmake-$CMAKE_VERSION-Darwin64-universal.dmg ] || curl -O http://www.cmake.org/files/v$cmake_dir/cmake-$CMAKE_VERSION-Darwin64-universal.dmg || exit 1 sudo hdiutil attach http://www.cmake.org/files/v2.8/cmake-$CMAKE_VERSION-Darwin64-universal.dmg || exit 1 sudo installer -target / -pkg /Volumes/cmake-$CMAKE_VERSION-Darwin64-universal/cmake-$CMAKE_VERSION-Darwin64-universal.pkg || exit 1 - sudo hdiutil detach /Volumes/cmake-$CMAKE_VERSION-Darwin64-universal || exit 1 + sudo hdiutil detach /Volumes/cmake-$CMAKE_VERSION-Darwin64-universal touch cmake-$CMAKE_VERSION-done fi |