[ooo-build-commit] .: bin/setup.in

[Andras Timar]

 bin/setup.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 59fb4742e7cd919f54f36002d0bcf92027a5a77c
Author: Andras Timar <timar at fsf.hu>
Date:   Tue Sep 21 09:31:59 2010 +0200

    fixed the sed command to extract completelangiso correctly

diff --git a/bin/setup.in b/bin/setup.in
index b312f50..6670dcc 100755
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -177,12 +177,12 @@ test -n "$OO_TOOLSDIR" && solenv_dir=$SOLARENV || solenv_dir=$OOBUILDDIR/solenv
 if test -f $solenv_dir/inc/postset.mk ; then
     # generate shell variable from completelangiso= from solenv/inc/postset.mk
     # the sed command does the following:
+    #	+ if a line ends with a backslash, append the next line to it
     #	+ adds " on the beginning of the value (after =)
-    #	+ adds " at the end of the value (end of line without the backslash \)
-    #	+ removes backslashes
+    #	+ adds " at the end of the value
     #	+ removes en-US; we want to put it on the beginning
     #	+ prints just the section starting with 'completelangiso=' and ending with the " at the end of line
-    eval $(sed -n 's/=/="/;s/\([^\\]\)$/\1"/;s/\\//;s/en-US//;/^completelangiso/p' $solenv_dir/inc/postset.mk)
+    eval $(sed -e :a -e '/\\$/N; s/\\\n//; ta' -n -e 's/=/="/;s/\([^\\]\)$/\1"/;s/en-US//;/^completelangiso/p' $solenv_dir/inc/postset.mk)
     ALL_LANGS="en-US $completelangiso"
     OOO_LANGS_LIST=`echo $OOO_LANGS | sed -e "s|ALL|$ALL_LANGS|g"`
 fi