[Libreoffice-commits] .: Branch 'libreoffice-3-3-0' - bin/localize-ooo

[Thorsten Behrens]

 bin/localize-ooo |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6f8db4a254008428a5d8aaf066e1b1242e7befdf
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Fri Jan 14 18:31:33 2011 +0100

    localize-ooo needs bash on mac, no cut but awk
    
    Fixes fdo#32197 - localize-ooo subtly depends on bash behaviour
    on echo and test calls - pure sh breaks that at least on mac.
    
    Signed-off-by: Norbert Thiebaud <nthiebaud at gmail.com>
    
    (cherry picked from commit ec0d18909d4fa0ce7b15613c3219af6fc5d85dbd)
    
    Signed-off-by: Thorsten Behrens <tbehrens at novell.com>
    Signed-off-by: Tor Lillqvist <tlillqvist at novell.com>
    Signed-off-by: Petr Mladek <pmladek at suse.cz>

diff --git a/bin/localize-ooo b/bin/localize-ooo
index d253d6d..59ec081 100755
--- a/bin/localize-ooo
+++ b/bin/localize-ooo
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 #
 # See setup for user tweakables.
@@ -35,7 +35,7 @@ merge_localization()
     awk -F "\t" '{ if ($10 != "en-US") print }' "$sdf_file" >"$sdf_file_filtered"
 
     # merge the localization
-    if test `wc -l "$sdf_file_filtered" | cut -d " " -f 1` -eq 0 ; then
+    if test `wc -l "$sdf_file_filtered" | awk '{print $1}'` -eq 0 ; then
 	echo "Warning: Ignoring empty extra localization $(basename $sdf_file)..."
     else
 	echo "Merging extra localization $(basename $sdf_file)..."