summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRex Dieter <rdieter@math.unl.edu>2015-04-04 10:39:53 -0500
committerRex Dieter <rdieter@math.unl.edu>2015-04-04 10:39:53 -0500
commit236c283ec94e097986015e6f84c189a8e09e4aed (patch)
tree5f4c1adaa4b2cc765c74c32cacc16f1d2a30ba75
parent686f6f48f6ff939c757881e3fc7a852b61d32c94 (diff)
xdg-desktop-menu: does not support filenames with spaces (BR66605)
merge interesting parts from downstream/ubuntu bug, https://bugs.launchpad.net/xdg-utils/+bug/1432932
-rw-r--r--ChangeLog3
-rw-r--r--scripts/xdg-desktop-menu.in4
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b36f717..92775ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
=== xdg-utils 1.1.x ===
+20`5-04-04 Rex Dieter <rdieter@fedoraproject.org>
+ * xdg-desktop-menu: does not support filenames with spaces (BR66605)
+
2015-03-23 Rex Dieter <rdieter@fedoraproject.org>
* xdg-open: fix regression where & gets replaced with \\& in URLs
diff --git a/scripts/xdg-desktop-menu.in b/scripts/xdg-desktop-menu.in
index bdd8d60..13159cb 100644
--- a/scripts/xdg-desktop-menu.in
+++ b/scripts/xdg-desktop-menu.in
@@ -231,12 +231,14 @@ BEGIN {
done
# Files to uninstall are listed in $tmpfile
# Existing files are in $orig_desktop_files
+ if [ ! -z "$orig_desktop_files" ]; then
for desktop_file in $orig_desktop_files; do
if ! grep '^'$desktop_file'$' $tmpfile > /dev/null 2> /dev/null; then
# Keep this file, it's not in the uninstall list
new_desktop_files="$new_desktop_files $desktop_file"
fi
done
+ fi
fi
rm -f "$tmpfile"
@@ -303,7 +305,7 @@ BEGIN {
if (match($0,/>/)) {
print substr($0,RSTART+1)
}
-}' $menu_file >> $tmpfile
+}' "$menu_file" >> $tmpfile
fi
done
orig_directory_files="$directory_files"