Kaydet (Commit) 0d61e5dc authored tarafından Ariel Constenla-Haile's avatar Ariel Constenla-Haile Kaydeden (comit) Caolán McNamara

odk - Fix reading OOVERSION from settings/dk.mk

(cherry picked from commit decff173)

Conflicts:
	odk/setsdkenv_unix

Change-Id: I4d78ebbb9f7b6d188dcba2140f26a17a8c17732f
üst af2053c3
...@@ -22,7 +22,7 @@ HOSTNAME=`hostname` ...@@ -22,7 +22,7 @@ HOSTNAME=`hostname`
CURRENTDIR=`/bin/pwd` CURRENTDIR=`/bin/pwd`
SDKTMPDIR=`dirname $0` SDKTMPDIR=`dirname $0`
OO_SDK_HOME=`(cd $SDKTMPDIR && pwd && cd $CURRENTDIR) | head -n 1` OO_SDK_HOME=`(cd $SDKTMPDIR && pwd && cd $CURRENTDIR) | head -n 1`
OOVERSION=`cat $OO_SDK_HOME/settings/dk.mk | tail -2 | head -n 1 | cut -d"=" -f2 | cut -d"." -f1,2` OOVERSION=`cat $OO_SDK_HOME/settings/dk.mk | tail -3 | head -n 1 | cut -d"=" -f2 | cut -d"." -f1,2`
if [ "$OSTYPE" = "Darwin" ] if [ "$OSTYPE" = "Darwin" ]
then then
OO_SDK_NAME=`basename $OO_SDK_HOME` OO_SDK_NAME=`basename $OO_SDK_HOME`
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment