[Libreoffice-commits] core.git: bin/distro-install-clean-up

Rene Engelhard rene at debian.org
Wed Apr 25 12:59:00 UTC 2018


 bin/distro-install-clean-up |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e0201bbb7f4e05bf3a4273eca6129e88a4d246f8
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Apr 25 14:55:43 2018 +0200

    add "s to grep in distro-install-clean-up
    
    as we have files with spaces now. E.g.
    grep: /data/rene/git/LibreOffice/master/debian/tmp/usr/lib/libreoffice/help/media/icon-themes/svx/res/symphony/enlarge: No such file or directory
    grep: font.png: No such file or directory
    happens otherwise.
    
    Change-Id: I13f8cab2aac751f7a0c2f673b5e958ed08657d52

diff --git a/bin/distro-install-clean-up b/bin/distro-install-clean-up
index 701c9ffa0972..974043dd005e 100755
--- a/bin/distro-install-clean-up
+++ b/bin/distro-install-clean-up
@@ -76,7 +76,7 @@ if test "z$DESTDIR" != "z" ; then
     echo "Checking for DESTDIR inside installed files..."
     found_destdir=
     for file in `find $DESTDIR -type f` ; do
-	grep -q "$DESTDIR" $file && echo "$file: includes the string \"$DESTDIR\"" && found_destdir=1
+	grep -q "$DESTDIR" "$file" && echo "$file: includes the string \"$DESTDIR\"" && found_destdir=1
     done
     if test "z$found_destdir" != "z" ; then
 	echo "!!!!!!!!!!!!!!!!!!!!!! WARNING !!!!!!!!!!!!!!!!!!!!!!"


More information about the Libreoffice-commits mailing list