diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2012-12-06 12:31:21 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-15 15:58:13 +0100 |
| commit | 0d61e5dcdbe2cec9df33ac22e3f0e4fbd6a07517 (patch) | |
| tree | 52c90a06990f04a5c3b8051c392ff1f58b29c920 /odk | |
| parent | af2053c318564ef56235482f058d30ae26ecf77d (diff) | |
odk - Fix reading OOVERSION from settings/dk.mk
(cherry picked from commit decff1733c9cdeca40fc0438a1333de236c954cd)
Conflicts:
odk/setsdkenv_unix
Change-Id: I4d78ebbb9f7b6d188dcba2140f26a17a8c17732f
Diffstat (limited to 'odk')
| -rwxr-xr-x | odk/config/setsdkenv_unix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/odk/config/setsdkenv_unix b/odk/config/setsdkenv_unix index 85925feb3c81..10db4dac5a62 100755 --- a/odk/config/setsdkenv_unix +++ b/odk/config/setsdkenv_unix @@ -22,7 +22,7 @@ HOSTNAME=`hostname` CURRENTDIR=`/bin/pwd` SDKTMPDIR=`dirname $0` 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" ] then OO_SDK_NAME=`basename $OO_SDK_HOME` |