odk/config/setsdkenv_unix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0d61e5dcdbe2cec9df33ac22e3f0e4fbd6a07517
Author: Ariel Constenla-Haile <arie...@apache.org>
Date: Thu Dec 6 12:31:21 2012 +0000
odk - Fix reading OOVERSION from settings/dk.mk
(cherry picked from commit decff1733c9cdeca40fc0438a1333de236c954cd)
Conflicts:
odk/setsdkenv_unix
Change-Id: I4d78ebbb9f7b6d188dcba2140f26a17a8c17732f
diff --git a/odk/config/setsdkenv_unix b/odk/config/setsdkenv_unix
index 85925fe..10db4da 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`
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
