From 6b80b3dadd37e05e6c472f1abca06d4d7e048a21 Mon Sep 17 00:00:00 2001 From: Jonathan Dahan Date: Mon, 19 Nov 2012 12:37:46 -0500 Subject: [PATCH] allow user to cancel automatic installation of dependencies during install --- scripts/osx64/Cura.app/Contents/MacOS/Cura | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/scripts/osx64/Cura.app/Contents/MacOS/Cura b/scripts/osx64/Cura.app/Contents/MacOS/Cura index e662bd4..58d6f75 100755 --- a/scripts/osx64/Cura.app/Contents/MacOS/Cura +++ b/scripts/osx64/Cura.app/Contents/MacOS/Cura @@ -11,12 +11,22 @@ fi displayMessage() { - /usr/bin/osascript > /dev/null <<-EOF + /usr/bin/osascript > /dev/null << EOF tell application "System Events" activate - display dialog "$@" buttons {"Ok"} + set question to display dialog "$@" +end tell +return button returned of question +EOF + if [ $? != 0 ]; then + /usr/bin/osascript > /dev/null << EOF +tell application "System Events" + activate + display dialog "User Cancelled Install" buttons {"Ok"} end tell EOF + exit 1 + fi } #Testing for python2.7, which we need and is not always installed on MacOS 1.6