diff options
Diffstat (limited to 'bin/distro-install-desktop-integration')
| -rwxr-xr-x | bin/distro-install-desktop-integration | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration index c00c8c6754fb..77ccf3ae016e 100755 --- a/bin/distro-install-desktop-integration +++ b/bin/distro-install-desktop-integration @@ -123,7 +123,7 @@ for file in *.desktop ; do -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \ -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \ "$file" >"$file.new" - mv "$file.new" "$file" + mv -f "$file.new" "$file" done cd - @@ -148,7 +148,7 @@ add_wrapper lomath soffice "--math" "libreoffice" "libreoffice-mat add_wrapper loimpress soffice "--impress" "libreoffice" "libreoffice-impress.desktop" "gid_Module_Brand_Prg_Impress" add_wrapper loweb soffice "--web" "libreoffice" "" "gid_Module_Brand_Prg_Wrt" add_wrapper lowriter soffice "--writer" "libreoffice" "libreoffice-writer.desktop" "gid_Module_Brand_Prg_Wrt" -add_wrapper lofromtemplate soffice ".uno:NewDoc" "libreoffice" "libreoffice-base.desktop" "gid_Module_Root_Brand" +add_wrapper lofromtemplate soffice ".uno:NewDoc" "libreoffice" "" "gid_Module_Root_Brand" add_wrapper libreoffice soffice "" "libreoffice" "libreoffice-startcenter.desktop" "gid_Module_Root_Brand" add_wrapper loffice soffice "" "libreoffice" "" "gid_Module_Root_Brand" add_wrapper unopkg unopkg "" "unopkg" "" "gid_Module_Root_Brand" @@ -160,7 +160,8 @@ add_wrapper unopkg unopkg "" "unopkg" "" # 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 $PREFIXDIR/bin/soffice +ln -sf $INSTALLDIR/program/soffice $DESTDIR$PREFIXDIR/bin/soffice +test -f $DESTDIR/gid_Module_Root_Brand && echo "$PREFIXDIR/bin/soffice" >>$DESTDIR/gid_Module_Root_Brand # create bash completion mkdir -p $DESTDIR/etc/bash_completion.d |