Accepting request 263575 from X11:common:Factory
1 OBS-URL: https://build.opensuse.org/request/show/263575 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/update-desktop-files?expand=0&rev=95
This commit is contained in:
commit
092f7d976a
@ -217,7 +217,7 @@ for i in $FILE_; do
|
||||
sed -e 's/\[KDE Desktop Entry\]/[Desktop Entry]/' "$i" > "${i}_" && mv "${i}_" "$i"
|
||||
|
||||
# dos2unix for the poor
|
||||
sed -e 's/
//' "$i" > "${i}_" && mv "${i}_" "$i"
|
||||
sed -e 's/\r//' "$i" > "${i}_" && mv "${i}_" "$i"
|
||||
|
||||
if [ "$FILE" ]; then
|
||||
echo "ERROR: suse_update_desktop_file: $APPLICATION has multiple desktop files" >&2
|
||||
@ -361,7 +361,7 @@ fi
|
||||
if [ "$GNAME" != "no" ]; then
|
||||
sed -i -e '/^GenericName\[/d' $FILE
|
||||
if [ -n "$GNAME" ]; then
|
||||
if ! grep -q ^GenericName= ${FILE}_; then
|
||||
if ! grep -q ^GenericName= ${FILE}; then
|
||||
sed -i -e '/^\[Desktop Entry\]/a '"GenericName=${GNAME//,/\,}" ${FILE}
|
||||
else
|
||||
sed -i -e '/^\[Desktop Entry\]/,/(\[.*|$)/ s,^GenericName=.*,GenericName='"${GNAME//,/\,}"',' ${FILE}
|
||||
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Nov 22 16:46:15 UTC 2014 - stefan.bruens@rwth-aachen.de
|
||||
|
||||
- Fix bad variable access for --genericname
|
||||
- replace ^M pattern with \r in sed pattern
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Nov 15 21:09:00 UTC 2014 - Led <ledest@gmail.com>
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user