[Libreoffice] [PATCH] colon needed for LD_LIBRARY_PATH set but empty

[Robert Nagy]

Yaeh it works fine, do not forget unopkg.sh either.

On (2010-12-10 20:49), Caolán McNamara wrote:
> On Sat, 2010-12-11 at 03:43 +0900, Takeshi Abe wrote:
> > Hi,
> > 
> > Poking desktop/scripts/soffice.sh for an Easy Hack, I wonder if there
> > exists a slight possibility of a trailing ':' of LD_LIBRARY_PATH, in
> > case that its original value is set but empty.
> > Anyway it looks subtle :)
> 
> Yes, I noted that. And I wondered if it was intentional or not. I'd
> really prefer the ${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} construct if
> possible.
> 
> caolanm->robert: Does Takeshi's patch work for you.
> 
> > 
> > Cheers,
> > -- Takeshi Abe
> > differences between files attachment
> > (0001-colon-needed-for-LD_LIBRARY_PATH-set-but-empty.patch)
> > From 4720c7b74c19542530e8c420fb1834ef07dd17ca Mon Sep 17 00:00:00 2001
> > From: Takeshi Abe <tabe at fixedpoint.jp>
> > Date: Sat, 11 Dec 2010 03:21:29 +0900
> > Subject: [PATCH] colon needed for LD_LIBRARY_PATH set but empty
> > 
> > ---
> >  desktop/scripts/soffice.sh |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
> > index 8e1439a..cbef3b4 100644
> > --- a/desktop/scripts/soffice.sh
> > +++ b/desktop/scripts/soffice.sh
> > @@ -73,7 +73,7 @@ case "`uname -s`" in
> >  OpenBSD) # this is a temporary hack until we can live with the default search paths
> >      sd_prog1="$sd_prog/../basis-link/program"
> >      sd_prog2="$sd_prog/../basis-link/ure-link/lib"
> > -    LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
> > +    LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
> >      JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null)
> >      export LD_LIBRARY_PATH
> >      if [ -n "${JAVA_HOME}" ]; then
> > _______________________________________________
> > LibreOffice mailing list
> > LibreOffice at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/libreoffice
> 
>