[Libreoffice-commits] core.git: bin/distro-install-desktop-integration

[Richard PALO]

 bin/distro-install-desktop-integration |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit b147a77f2e179f474051a4e50fa7ea300cdec8ee
Author: Richard PALO <richard at NetBSD.org>
Date:   Tue Sep 15 14:44:31 2015 +0200

    Use portable ordering for mktemp
    Add omitted APPDATA_SOURCE_DIR for *.appdata.xml files
    Avoid gnu rmdir by using portable invocation
    
    Change-Id: I15a507f3d181f27c86b5332d58a9d76b31eb2fd1
    Reviewed-on: https://gerrit.libreoffice.org/18588
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration
index 4cf652d..ed31d5b 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -94,7 +94,7 @@ add_wrapper()
 }
 
 # install desktop integration from plain packages
-sysui_temp=`mktemp -t -d distro-pack-desktop-integration-XXXXXX`
+sysui_temp=`mktemp -d -t distro-pack-desktop-integration-XXXXXX`
 cp -a workdir/CustomTarget/sysui/share/libreoffice/* "$sysui_temp"
 cp -a sysui/desktop/share/create_tree.sh "$sysui_temp"
 builddir=`pwd`
@@ -116,6 +116,7 @@ sed -i \
     export PREFIXDIR=${PREFIXDIR}
     export GNOMEDIR=$PREFIXDIR
     export GNOME_MIME_THEME=hicolor
+    export APPDATA_SOURCE_DIR=$builddir/sysui/desktop/appstream-appdata
     bash ./create_tree.sh
 )
 cd -
@@ -124,7 +125,7 @@ rm -rf $sysui_temp
 # we do not want some stuff from the plain packages
 if test -d $DESTDIR/opt ; then
     rm -f $DESTDIR/opt/$INSTALLDIRNAME
-    rmdir --ignore-fail-on-non-empty $DESTDIR/opt
+    rmdir $DESTDIR/opt 2>/dev/null || true
 fi
 
 # we want non-versioned desktop files