--- bin/distro-install-desktop-integration.orig 2019-01-24 03:35:25.000000000 +0800 +++ bin/distro-install-desktop-integration 2019-02-03 18:17:18.645630000 +0800 @@ -98,7 +98,7 @@ cp -a "${SRCDIR?}"/sysui/desktop/share/create_tree.sh "$sysui_temp" cd $sysui_temp # we want non-versioned stuff in the distro packages -sed -i \ +sed -i "" \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \ -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \ @@ -108,13 +108,13 @@ export OFFICE_PREFIX=$LIBDIR export PREFIX=$INSTALLDIRNAME export ICON_PREFIX=$INSTALLDIRNAME - export ICON_SOURCE_DIR="${SRCDIR?}"/sysui/desktop/icons + export ICON_SOURCE_DIR="${SRCDIR}"/sysui/desktop/icons export PRODUCTVERSION= export KDEMAINDIR=$PREFIXDIR export PREFIXDIR=${PREFIXDIR} export GNOMEDIR=$PREFIXDIR export GNOME_MIME_THEME=hicolor - export APPDATA_SOURCE_DIR="${SRCDIR?}"/sysui/desktop/appstream-appdata + export APPDATA_SOURCE_DIR="${SRCDIR}"/sysui/desktop/appstream-appdata bash ./create_tree.sh ) cd - @@ -129,7 +129,7 @@ # we want non-versioned desktop files cd $DESTDIR/$INSTALLDIR/share/xdg # we want non-versioned stuff in the distro packages -sed -i \ +sed -i "" \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \ -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \ @@ -143,7 +143,7 @@ $PREFIXDIR/share/mime/packages \ $PREFIXDIR/share/mime-info \ $PREFIXDIR/share/icons ; do - find "$DESTDIR$dir" \( -type f -o -type l \) -printf "$dir/%P\n" >>$DESTDIR/gid_Module_Root_Brand + find "$DESTDIR$dir" \( -type f -o -type l \) | sed -e "s|^$DESTDIR||" >>$DESTDIR/gid_Module_Root_Brand done fi @@ -171,16 +171,16 @@ # you cannot include this link directly into the package # For example, the Novell package mark this symlink as %ghost # and update it in %post and %postun -ln -sf "$INSTALLDIR/program/soffice" "$DESTDIR$BINDIR/soffice" +ln -sf ../lib/libreoffice/program/soffice $DESTDIR$PREFIXDIR/bin/soffice test -f $DESTDIR/gid_Module_Root_Brand && echo "$BINDIR/soffice" >>$DESTDIR/gid_Module_Root_Brand # create bash completion -mkdir -p $DESTDIR/usr/share/bash-completion/completions -"${SRCDIR?}"/bin/generate-bash-completion.py bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh -test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand +mkdir -p $DESTDIR/${PREFIXDIR}/share/bash-completion/completions +"${SRCDIR?}"/bin/generate-bash-completion.py bin/bash-completion.in $DESTDIR${PREFIXDIR}/share/bash-completion/completions/$INSTALLDIRNAME.sh +test -f $DESTDIR/gid_Module_Root_Brand && echo "${PREFIXDIR}/share/bash-completion/completions/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand if test "$WITH_COMPAT_OOWRAPPERS" = "TRUE" ; then - "${SRCDIR?}"/bin/generate-bash-completion.py --compat-oowrappers bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/ooffice.sh - test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand + "${SRCDIR?}"/bin/generate-bash-completion.py --compat-oowrappers bin/bash-completion.in $DESTDIR${PREFIXDIR}/share/bash-completion/completions/ooffice.sh + test -f $DESTDIR/gid_Module_Root_Brand && echo "${PREFIXDIR}/share/bash-completion/completions/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand fi echo "Install $OOINSTDIR/basis$VERSION/program/java-set-classpath";