--- /fs01/home/ubuntu-builder/FileSystem/usr/bin/xdg-desktop-menu	2013-03-20 14:47:15.000000000 -0400
+++ /usr/bin/xdg-desktop-menu	2015-03-17 00:06:04.466327246 -0400
@@ -791,7 +791,6 @@
     fi
 
     orig_menu_file=$xdg_dir/$menu_file
-
     DEBUG 1 "Updating $orig_menu_file ($action)"
 
     test "${TMPDIR+set}" = set || TMPDIR=/tmp
@@ -828,18 +827,18 @@
             echo "$desktop_file" >> $tmpfile
         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"
 
     DEBUG 3 "Files to list in $menu_file: $new_desktop_files"
-
     if [ -n "$new_desktop_files" ] ; then
         # Install/update
         test "${TMPDIR+set}" = set || TMPDIR=/tmp
@@ -891,7 +890,7 @@
         test "${TMPDIR+set}" = set || TMPDIR=/tmp
         tmpfile=`mktemp $TMPDIR/tmp.XXXXXXXXXX`
         for menu_file in $xdg_dir/*; do
-            if grep 'generated and managed by xdg-desktop-menu' $menu_file > /dev/null 2> /dev/null; then
+            if grep 'generated and managed by xdg-desktop-menu' "$menu_file" > /dev/null 2> /dev/null; then
                 awk '
 # List all files within <Directory> tags
 BEGIN {
@@ -901,7 +900,7 @@
   if (match($0,/>/)) {
      print substr($0,RSTART+1)
   }
-}' $menu_file >> $tmpfile
+}' "${menu_file}" >> $tmpfile
             fi
         done
         orig_directory_files="$directory_files"