Attachment 6420 Details for Bug 31429 – diff -u

[patch] diff -u

diff (text/plain), 1.97 KB, created by Alexander Shemetov on 2015-11-05 07:54:36 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Shemetov

Created: 2015-11-05 07:54:36 MSK

Size: 1.97 KB

patch

obsolete

>--- lbus_event_handler.sh	2015-11-03 09:42:16.000000000 +0500
>+++ lbus_event_handler.sh_old	2008-05-07 22:36:55.000000000 +0600
>@@ -37,7 +37,6 @@
>   . ${HOME}/.ltsp-localdev.conf
> fi
> 
>-DESKTOP="Ð Ð°Ð±Ð¾ÑÐ¸Ð¹ ÑÑÐ¾Ð»"
> DRIVEDIR=${DRIVE_DIR:-Drives}
> ICON=${FOLDER_ICON:-harddrive}
> ICON_CD=${FOLDER_ICON_CD:-$FOLDER_ICON}
>@@ -58,7 +57,7 @@
>     *)		icon="$ICON" ;;
>   esac
>   SHARENAME=$2
>-  cat <<-EOF  >"${HOME}/$DESKTOP/${SHARENAME}.desktop"
>+  cat <<-EOF  >${HOME}/Desktop/${SHARENAME}.desktop
> 	[Desktop Entry]
> 	Encoding=UTF-8
> 	Name=${1}
>@@ -86,11 +85,11 @@
>       done
>     fi
> 
>-    if [ -d "${HOME}/$DESKTOP" ]; then
>-      for desktop in "${HOME}/$DESKTOP/*.desktop"; do
>-        if [ -f "${desktop}" ]; then
>-          if grep -q lbus_event_handler "${desktop}"; then
>-            rm -f "${desktop}"
>+    if [ -d ${HOME}/Desktop ]; then
>+      for desktop in ${HOME}/Desktop/*.desktop; do
>+        if [ -f ${desktop} ]; then
>+          if grep -q lbus_event_handler ${desktop}; then
>+            rm -f ${desktop}
>           fi
>         fi
>       done
>@@ -115,7 +114,7 @@
>           block)  mkdir "${HOME}/${DRIVEDIR}/${SHARENAME}"
>                   /usr/sbin/ltspfs ${WS}:/tmp/drives/${SHARENAME} \
>                                    "${HOME}/${DRIVEDIR}/${SHARENAME}"
>-                  if [ -d "${HOME}/$DESKTOP" ]; then
>+                  if [ -d ${HOME}/Desktop ]; then
>                     create_icon "${DESC}" "${SHARENAME}" \
>                                 "${HOME}/${DRIVEDIR}/${SHARENAME}"
>                   fi
>@@ -131,8 +130,8 @@
>       case "${DEVTYPE}" in
>           block)  fusermount -u -z "${HOME}/${DRIVEDIR}/${SHARENAME}"
>                   rmdir "${HOME}/${DRIVEDIR}/${SHARENAME}"
>-                  if [ -d "${HOME}/$DESKTOP" ]; then
>-                    rm -f "${HOME}/$DESKTOP/${SHARENAME}.desktop"
>+                  if [ -d ${HOME}/Desktop ]; then
>+                    rm -f "${HOME}/Desktop/${SHARENAME}.desktop"
>                   fi
>                   ;;
>       esac

Actions: View | Diff

Attachments on bug 31429: 6416 | 6420