Kaydet (Commit) b147a77f authored tarafından Richard PALO's avatar Richard PALO Kaydeden (comit) Michael Stahl

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/18588Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst 20dd938d
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment