Attachment 16358 Details for Bug 15827 – bashisms.diff

[patch] bashisms.diff

bashisms.diff (text/plain), 1.34 KB, created by Per Olofsson on 2008-05-05 01:55:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Per Olofsson

Created: 2008-05-05 01:55:34 UTC

Size: 1.34 KB

patch

obsolete

>Index: xdg-utils/scripts/xdg-mime
>===================================================================
>--- xdg-utils.orig/scripts/xdg-mime
>+++ xdg-utils/scripts/xdg-mime
>@@ -1076,7 +1076,7 @@
> 
>         # No quotes around $mimetypes
>         for x in $mimetypes ; do 
>-            if grep '^# Installed by xdg-mime' $kde_dir/$x.desktop &>/dev/null ; then
>+            if grep '^# Installed by xdg-mime' $kde_dir/$x.desktop >/dev/null 2>&1; then
>                 DEBUG 1 "Removing $kde_dir/$x.desktop (KDE 3.x support)"
>                 rm -f $kde_dir/$x.desktop
>             fi
>Index: xdg-utils/scripts/xdg-screensaver
>===================================================================
>--- xdg-utils.orig/scripts/xdg-screensaver
>+++ xdg-utils/scripts/xdg-screensaver
>@@ -364,7 +364,7 @@
>    # No secure moves available, use home dir
>    DEBUG 1 "mv -T not available"
>    MV="mv"
>-   screensaver_file="$HOME/.xdg-screensaver-"`echo $HOSTNAME-$DISPLAY | sed 's/:/-/g'`
>+   screensaver_file="$HOME/.xdg-screensaver-"`echo $(hostname)-$DISPLAY | sed 's/:/-/g'`
> fi
> lockfile_command=`which lockfile 2> /dev/null`
> 
>@@ -464,7 +464,7 @@
>   unlockfile # Free lockfile
>   if [ -n "$xprop_pid" ] && ps -p "$xprop_pid" 2> /dev/null | grep xprop > /dev/null; then
>      # Kill the tracking process 
>-     kill -TERM $xprop_pid
>+     kill -s TERM $xprop_pid
>   fi
>   cleanup_suspend  
> }

Actions: View | Splinter Review

Attachments on bug 15827: 16358

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.