diff options
| author | Richard PALO <richard@NetBSD.org> | 2015-09-15 14:44:31 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-10-27 16:11:01 +0000 |
| commit | b147a77f2e179f474051a4e50fa7ea300cdec8ee (patch) | |
| tree | c5a8b15fc43abd967467c0665dfa501d44dc6f74 /bin | |
| parent | 20dd938d06ba96817f0cd58aad50b0bec952d077 (diff) | |
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@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/distro-install-desktop-integration | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration index 4cf652decc41..ed31d5ba9dc7 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 |