Kaydet (Commit) 1fceff3d authored tarafından Tomas Chvatal's avatar Tomas Chvatal Kaydeden (comit) Petr Mladek

distro-install-desktop-integration: use "sed -i"

use the more elegant "sed -i" instead of "sed+mv"
Signed-off-by: 's avatarPetr Mladek <pmladek@suse.cz>
üst 9602fbb2
...@@ -84,13 +84,11 @@ cp -a sysui/desktop/share/create_tree.sh "$sysui_temp" ...@@ -84,13 +84,11 @@ cp -a sysui/desktop/share/create_tree.sh "$sysui_temp"
builddir=`pwd` builddir=`pwd`
cd $sysui_temp cd $sysui_temp
# we want non-versioned stuff in the distro packages # we want non-versioned stuff in the distro packages
for file in * ; do sed -i \
sed -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \
-e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \
-e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \ -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \
"$file" >"$file.new" *
mv "$file.new" "$file"
done
# call in subshell to do not malfrom PRODUCTVERSION, ... # call in subshell to do not malfrom PRODUCTVERSION, ...
( (
export OFFICE_PREFIX=$LIBDIR export OFFICE_PREFIX=$LIBDIR
...@@ -118,13 +116,11 @@ fi ...@@ -118,13 +116,11 @@ fi
# we want non-versioned desktop files # we want non-versioned desktop files
cd $DESTDIR/$INSTALLDIR/share/xdg cd $DESTDIR/$INSTALLDIR/share/xdg
# we want non-versioned stuff in the distro packages # we want non-versioned stuff in the distro packages
for file in *.desktop ; do sed -i \
sed -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \
-e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \
-e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \ -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \
"$file" >"$file.new" *.desktop
mv -f "$file.new" "$file"
done
cd - cd -
# put the stuff installed by create_tree.sh into the right file lists # put the stuff installed by create_tree.sh into the right file lists
......
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