View | Details | Raw Unified | Return to bug 31429
Collapse All | Expand All

(-)lbus_event_handler.sh (-10 / +9 lines)
Lines 37-43 Link Here
37
  . ${HOME}/.ltsp-localdev.conf
37
  . ${HOME}/.ltsp-localdev.conf
38
fi
38
fi
39
39
40
DESKTOP="Рабочий стол"
41
DRIVEDIR=${DRIVE_DIR:-Drives}
40
DRIVEDIR=${DRIVE_DIR:-Drives}
42
ICON=${FOLDER_ICON:-harddrive}
41
ICON=${FOLDER_ICON:-harddrive}
43
ICON_CD=${FOLDER_ICON_CD:-$FOLDER_ICON}
42
ICON_CD=${FOLDER_ICON_CD:-$FOLDER_ICON}
Lines 58-64 Link Here
58
    *)		icon="$ICON" ;;
57
    *)		icon="$ICON" ;;
59
  esac
58
  esac
60
  SHARENAME=$2
59
  SHARENAME=$2
61
  cat <<-EOF  >"${HOME}/$DESKTOP/${SHARENAME}.desktop"
60
  cat <<-EOF  >${HOME}/Desktop/${SHARENAME}.desktop
62
	[Desktop Entry]
61
	[Desktop Entry]
63
	Encoding=UTF-8
62
	Encoding=UTF-8
64
	Name=${1}
63
	Name=${1}
Lines 86-96 Link Here
86
      done
85
      done
87
    fi
86
    fi
88
87
89
    if [ -d "${HOME}/$DESKTOP" ]; then
88
    if [ -d ${HOME}/Desktop ]; then
90
      for desktop in "${HOME}/$DESKTOP/*.desktop"; do
89
      for desktop in ${HOME}/Desktop/*.desktop; do
91
        if [ -f "${desktop}" ]; then
90
        if [ -f ${desktop} ]; then
92
          if grep -q lbus_event_handler "${desktop}"; then
91
          if grep -q lbus_event_handler ${desktop}; then
93
            rm -f "${desktop}"
92
            rm -f ${desktop}
94
          fi
93
          fi
95
        fi
94
        fi
96
      done
95
      done
Lines 115-121 Link Here
115
          block)  mkdir "${HOME}/${DRIVEDIR}/${SHARENAME}"
114
          block)  mkdir "${HOME}/${DRIVEDIR}/${SHARENAME}"
116
                  /usr/sbin/ltspfs ${WS}:/tmp/drives/${SHARENAME} \
115
                  /usr/sbin/ltspfs ${WS}:/tmp/drives/${SHARENAME} \
117
                                   "${HOME}/${DRIVEDIR}/${SHARENAME}"
116
                                   "${HOME}/${DRIVEDIR}/${SHARENAME}"
118
                  if [ -d "${HOME}/$DESKTOP" ]; then
117
                  if [ -d ${HOME}/Desktop ]; then
119
                    create_icon "${DESC}" "${SHARENAME}" \
118
                    create_icon "${DESC}" "${SHARENAME}" \
120
                                "${HOME}/${DRIVEDIR}/${SHARENAME}"
119
                                "${HOME}/${DRIVEDIR}/${SHARENAME}"
121
                  fi
120
                  fi
Lines 131-138 Link Here
131
      case "${DEVTYPE}" in
130
      case "${DEVTYPE}" in
132
          block)  fusermount -u -z "${HOME}/${DRIVEDIR}/${SHARENAME}"
131
          block)  fusermount -u -z "${HOME}/${DRIVEDIR}/${SHARENAME}"
133
                  rmdir "${HOME}/${DRIVEDIR}/${SHARENAME}"
132
                  rmdir "${HOME}/${DRIVEDIR}/${SHARENAME}"
134
                  if [ -d "${HOME}/$DESKTOP" ]; then
133
                  if [ -d ${HOME}/Desktop ]; then
135
                    rm -f "${HOME}/$DESKTOP/${SHARENAME}.desktop"
134
                    rm -f "${HOME}/Desktop/${SHARENAME}.desktop"
136
                  fi
135
                  fi
137
                  ;;
136
                  ;;
138
      esac
137
      esac

Return to bug 31429