[Libreoffice] [REVIEW] needed for localize-ooo fix

Hi,

the extra localizations from LibO are not applied properly at least
on Mac (not yet clear whether the .deb issue has the same root cause
- https://bugs.freedesktop.org//show_bug.cgi?id=33105).

Reason is a non-working localize-ooo, the first patch ensures bash
is used (and portably found). I need triple approval for this, needs
to go into 3-3-0

The second patch avoids a somewhat fragile cut call - that one is
not strictly necessary for 3-3-0, but I'd love to have it in 3-3

Cheers,

-- Thorsten

From 49fc7cb9edf9adb842a26c34f70c1998835cf8b7 Mon Sep 17 00:00:00 2001
From: Thorsten Behrens <tbehrens@novell.com>
Date: Fri, 14 Jan 2011 14:11:01 +0100
Subject: [PATCH 1/2] localize-ooo needs bash on mac

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

diff --git a/bin/localize-ooo b/bin/localize-ooo
index d253d6d..5ca976f 100755
--- a/bin/localize-ooo
+++ b/bin/localize-ooo
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 #
 # See setup for user tweakables.
-- 
1.7.1

From 199ca498aaa70c8abfa2722a74d509508c0f661f Mon Sep 17 00:00:00 2001
From: Thorsten Behrens <tbehrens@novell.com>
Date: Fri, 14 Jan 2011 14:12:01 +0100
Subject: [PATCH 2/2] Replace cut by awk, which seems more robust

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

diff --git a/bin/localize-ooo b/bin/localize-ooo
index 5ca976f..135122d 100755
--- a/bin/localize-ooo
+++ b/bin/localize-ooo
@@ -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)..."
-- 
1.7.1

Attachment: pgpr8YI3uMv6z.pgp
Description: PGP signature