Merge pull request #39 from lawrencejohnston/master

Fixes for #37 and #38
This commit is contained in:
daid 2012-04-08 10:47:51 -07:00
commit 7d68441d7c
2 changed files with 9 additions and 4 deletions

8
.gitignore vendored
View File

@ -3,7 +3,7 @@
*.pyc *.pyc
*.zip *.zip
*.exe *.exe
osx64-Cura-NewUI* osx64-Cura-*
win32-Cura-NewUI* win32-Cura-*
linux-Cura-NewUI* linux-Cura-*
Printrun Printrun

View File

@ -40,6 +40,11 @@ function checkTool
# Actual build script # Actual build script
############################# #############################
# Change working directory to the directory the script is in
# http://stackoverflow.com/a/246128
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd $SCRIPT_DIR
checkTool git "git: http://git-scm.com/" checkTool git "git: http://git-scm.com/"
checkTool curl "curl: http://curl.haxx.se/" checkTool curl "curl: http://curl.haxx.se/"
if [ $BUILD_TARGET = "win32" ]; then if [ $BUILD_TARGET = "win32" ]; then