[Libreoffice-commits] .: Branch 'libreoffice-3-3' - solenv/bin

[Robert Nagy]

 solenv/bin/ooinstall |   18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

New commits:
commit 63cd4d9270e8b873f3fa139b6dfff17d74742c3e
Author: Robert Nagy <robert at openbsd.org>
Date:   Tue Nov 30 15:51:43 2010 +0100

    fix the list of languages and remove the unused wanted function
    
    Let's try our best to create a good list of langauges in a format
    of lang1,lang2.
    Also remove the wanted function which is not used since
    the baab40f5646b63ff51e7cb9c5aaac873066d46fe commit.

diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index dfca65e..c20be41 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -14,18 +14,6 @@ use Cwd;
 $path = '';
 $do_link = 0;
 
-sub wanted {
-    my $path_to_unopkg="$path/program";
-    if ( $^O =~ /darwin/i )
-    {
-        $path_to_unopkg="$path/OpenOffice.org.app/Contents/MacOS";
-    }
-    -f $_
-	&& /.*\.oxt$/
-	&& system ( "LD_LIBRARY_PATH='' $path_to_unopkg/unopkg add -v --shared $File::Find::name" )
-	&& die "Cannot install $_ extension!";
-}
-
 ( $^O =~ /openbsd/i ) || ( $^O =~ /darwin/i ) || ( -f "/proc/meminfo" ) || die "The installer cannot work without javaldx running, which requires /proc to be mounted";
 
 # Workaround for system Mozilla
@@ -77,10 +65,8 @@ $ENV{DEFAULT_TO_ENGLISH_FOR_PACKING} = 1;
 
 $langs=$ENV{WITH_LANG};
 $langs='en-US' if $langs eq '';
-$langs =~ s/\s+/,/g;
-# FIXME: hack... we get a useless , at the end which makes it being e.g. zu#
-# which breaks the build...
-$langs =~ s/,'/'/;
+my @larr = grep { $_ ne '' } split(/ /, $langs);
+$langs = join (",", @larr);
 
 $destdir='';
 if ( defined $ENV{OODESTDIR} &&