From: daid <daid303@gmail.com>
Date: Thu, 5 Jul 2012 11:08:13 +0000 (+0200)
Subject: Updated macOS scripts to be commands, makes them easier to run.
X-Git-Tag: 12.07~15
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=68f6ebf5d29f217f47a677476b7ff7e90a090c9f;p=cura.git

Updated macOS scripts to be commands, makes them easier to run.
---

diff --git a/package.sh b/package.sh
index a84b8d7a..5845d6fd 100755
--- a/package.sh
+++ b/package.sh
@@ -154,6 +154,7 @@ if [ $BUILD_TARGET = "win32" ]; then
     cp -a scripts/${BUILD_TARGET}/*.bat $TARGET_DIR/
 else
     cp -a scripts/${BUILD_TARGET}/*.sh $TARGET_DIR/
+    cp -a scripts/${BUILD_TARGET}/*.command $TARGET_DIR/
 fi
 
 #package the result
diff --git a/scripts/osx64/cura.sh b/scripts/osx64/cura.command
similarity index 69%
rename from scripts/osx64/cura.sh
rename to scripts/osx64/cura.command
index d48f3650..2248b06c 100755
--- a/scripts/osx64/cura.sh
+++ b/scripts/osx64/cura.command
@@ -1,20 +1,27 @@
 #!/bin/bash
 
-python -c 'import OpenGL'
+python2.7 -c ''
+if [ $? != 0 ]; then
+	echo "Requires python2.7"
+	echo " Install python2.7"
+	exit 1
+fi
+
+python2.7 -c 'import OpenGL'
 if [ $? != 0 ]; then
 	echo "Requires PyOpenGL"
 	echo " sudo easy_install PyOpenGL"
 	exit 1
 fi
 
-python -c 'import wx'
+python2.7 -c 'import wx'
 if [ $? != 0 ]; then
 	echo "Requires wx. Download and install (the Cocoa/64-bit variant) from:"
 	echo " http://www.wxpython.org/download.php"
 	exit 1
 fi
 
-python -c 'import serial'
+python2.7 -c 'import serial'
 if [ $? != 0 ]; then
 	echo "Requires pyserial."
 	echo " sudo easy_install pyserial"
diff --git a/scripts/osx64/pronterface.sh b/scripts/osx64/pronterface.command
similarity index 100%
rename from scripts/osx64/pronterface.sh
rename to scripts/osx64/pronterface.command