[Libreoffice-commits] online.git: loolwsd/loolwsd-systemplate-setup

Tor Lillqvist tml at collabora.com
Fri Feb 12 12:09:49 UTC 2016


 loolwsd/loolwsd-systemplate-setup |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8a571401c0ec2f195b4ec0c75920aadf48640d69
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Feb 12 14:09:29 2016 +0200

    Use less misleadit variable name

diff --git a/loolwsd/loolwsd-systemplate-setup b/loolwsd/loolwsd-systemplate-setup
index 97da6ad..2b346a5 100755
--- a/loolwsd/loolwsd-systemplate-setup
+++ b/loolwsd/loolwsd-systemplate-setup
@@ -6,7 +6,7 @@ test $# -eq 2 || { echo "Usage: $0 <chroot template directory for system libs to
 
 CHROOT=$1
 INSTDIR=$2
-POCODIR="/usr/local/lib /opt/poco/lib"
+POCOLIBDIRS="/usr/local/lib /opt/poco/lib"
 
 test -d "$INSTDIR" || { echo "No such directory: $INSTDIR"; exit 1; }
 
@@ -57,8 +57,8 @@ done |
 grep -v dynamic | cut -d " " -f 3 | grep -E '^(/lib|/usr)' | sort -u | sed -e 's,^/,,'
 
 # Poco libraries and their dependencies
-find $POCODIR -name '*Poco*.so' -o -name '*Poco*.so.[0-9]*'
-find $POCODIR /usr/lib64 -name '*Poco*.so' -o -name '*Poco*.so.[0-9]*' |
+find $POCOLIBDIRS -name '*Poco*.so' -o -name '*Poco*.so.[0-9]*'
+find $POCOLIBDIRS /usr/lib64 -name '*Poco*.so' -o -name '*Poco*.so.[0-9]*' |
 while read file; do
     echo $file
     ldd $file 2>/dev/null


More information about the Libreoffice-commits mailing list