osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Guy Harris 2014-07-27 13:30:44 -07:00
parent 5b1106d1af
commit dacf6e4d87
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
macosx-setup.sh
View File

@ -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