mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fixed android setup script, if run as update. (git fetch instead of git pull)

Browse Source 
* Checking return of openssl build now and inform about build errors.
This commit is contained in:
Armin Novak 2014-07-13 13:35:11 +02:00
parent 4d3ea77972
commit 0e61cd296c
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/android_setup_build_env.sh
View File

@ -45,7 +45,7 @@ echo "Preparing OpenSSL..."
OPENSSL_SRC=$ROOT/openssl-build OPENSSL_SRC=$ROOT/openssl-build
if [ -d $OPENSSL_SRC ]; then if [ -d $OPENSSL_SRC ]; then
cd $OPENSSL_SRC cd $OPENSSL_SRC
git pull git fetch
RETVAL=$? RETVAL=$?
else else
git clone $OPENSSL_SCM $OPENSSL_SRC git clone $OPENSSL_SCM $OPENSSL_SRC
@ -64,9 +64,7 @@ make clean
# The makefile has a bug, which aborts during # The makefile has a bug, which aborts during
# first compilation. Rerun make to build the whole lib. # first compilation. Rerun make to build the whole lib.
make make
make RETVAL=$?
make
RETVAL=0 # TODO: Check, why 2 is returned.
if [ $RETVAL -ne 0 ]; then if [ $RETVAL -ne 0 ]; then
echo "Failed to execute make command [$RETVAL]" echo "Failed to execute make command [$RETVAL]"
exit -4 exit -4