From: daid <daid303@gmail.com>
Date: Thu, 15 Dec 2011 09:22:34 +0000 (+0100)
Subject: Updated build script to check for 7zip
X-Git-Tag: RC1~187
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ded1a459704285ef048d193f97f4685e80d9d230;p=cura.git

Updated build script to check for 7zip
---

diff --git a/build.sh b/build.sh
index db1a48cc..65772860 100755
--- a/build.sh
+++ b/build.sh
@@ -1,13 +1,21 @@
 #!/bin/sh
 
+7z > /dev/null 2>&1
+if [ $? != 0 ]; then
+	echo $0 requires 7zip to run.
+	exit 1
+fi
+
 #Get portable python and extract it.
 if [ ! -f "PortablePython_2.7.2.1.exe" ]; then
 	wget http://ftp.nluug.nl/languages/python/portablepython/v2.7/PortablePython_2.7.2.1.exe
 fi
 if [ ! -d target/python ]; then
 	7z x PortablePython_2.7.2.1.exe \$_OUTDIR/App
+	7z x PortablePython_2.7.2.1.exe \$_OUTDIR/Lib/site-packages/wx-2.8-msw-unicode
 	mkdir -p target/python
 	mv \$_OUTDIR/App/* target/python
+	mv \$_OUTDIR/Lib target/python
 	rm -rf \$_OUTDIR
 fi