diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-07-18 12:32:57 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-07-19 15:13:38 +0200 |
| commit | 1bca77c8e64921e48a131c49e258420251dd23fc (patch) | |
| tree | bc7d3d78fcb4b02eeb907b02aa70977083240910 /bin | |
| parent | 33974a3c51ed42ef7c2d63b7de1344e77b9c7061 (diff) | |
distro-install-desktop-integration: work with normal user
+ alllow to overwrite the readonly desktop files
+ create the compat soffice symlink in DESTDIR
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
Signed-off-by: Andreas Radke <a.radke@arcor.de>
Signed-off-by: Fridrich Strba <fridrich.strba@bluewin.ch>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/distro-install-desktop-integration | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration index c00c8c6754fb..600c54e16341 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 - @@ -160,7 +160,7 @@ 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 # create bash completion mkdir -p $DESTDIR/etc/bash_completion.d |