From: daid <daid303@gmail.com>
Date: Mon, 19 Mar 2012 11:09:50 +0000 (+0100)
Subject: Updated osx scripts not to use 2.7 version of python, but whatever is available
X-Git-Tag: RC1~57
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=41adf54d0c0917e5ab63a5b684f2b00d8a015d6b;p=cura.git

Updated osx scripts not to use 2.7 version of python, but whatever is available
---

diff --git a/scripts/osx64/pronterface.sh b/scripts/osx64/pronterface.sh
index 83896aa0..86e7c29b 100755
--- a/scripts/osx64/pronterface.sh
+++ b/scripts/osx64/pronterface.sh
@@ -1,19 +1,19 @@
 #!/bin/bash
 
-python2.7 -c 'import wx'
+python -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
 
-python2.7 -c 'import serial'
+python -c 'import serial'
 if [ $? != 0 ]; then
 	echo "Requires pyserial."
-	echo " sudo easy_install-2.7 pyserial"
+	echo " sudo easy_install pyserial"
 	exit 1
 fi
 
 SCRIPT_DIR=`dirname $0`
-python2.7 ${SCRIPT_DIR}/Printrun/pronterface.py
+python ${SCRIPT_DIR}/Printrun/pronterface.py
 
diff --git a/scripts/osx64/skeinpypy.sh b/scripts/osx64/skeinpypy.sh
index 736b3018..14e10fbd 100755
--- a/scripts/osx64/skeinpypy.sh
+++ b/scripts/osx64/skeinpypy.sh
@@ -1,26 +1,26 @@
 #!/bin/bash
 
-python2.7 -c 'import OpenGL'
+python -c 'import OpenGL'
 if [ $? != 0 ]; then
 	echo "Requires PyOpenGL"
-	echo " sudo easy_install-2.7 PyOpenGL"
+	echo " sudo easy_install PyOpenGL"
 	exit 1
 fi
 
-python2.7 -c 'import wx'
+python -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
 
-python2.7 -c 'import serial'
+python -c 'import serial'
 if [ $? != 0 ]; then
 	echo "Requires pyserial."
-	echo " sudo easy_install-2.7 pyserial"
+	echo " sudo easy_install pyserial"
 	exit 1
 fi
 
 SCRIPT_DIR=`dirname $0`
-python2.7 ${SCRIPT_DIR}/SkeinPyPy/skeinpypy.py
+python ${SCRIPT_DIR}/SkeinPyPy/skeinpypy.py