Magellan Linux

  • Back to homepage
    • /[mcore-svn]/mcore-src/trunk/mcore-tools/src/modules/idesk/idesk-generate-all-desktop-icons.in

    Diff of /mcore-src/trunk/mcore-tools/src/modules/idesk/idesk-generate-all-desktop-icons.in

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 2411 by niro, Mon Aug 31 09:35:35 2015 UTC revision 2415 by niro, Mon Aug 31 11:13:15 2015 UTC
    # Line 19  rc="${MCORE_UNPRIV_HOME}/.ideskrc" Line 19  rc="${MCORE_UNPRIV_HOME}/.ideskrc"
    19  # progs path  # progs path
    20  progsh_path="${MCORE_UNPRIV_HOME}/.progs"  progsh_path="${MCORE_UNPRIV_HOME}/.progs"
    21    
    22    if [[ $(whoami) = ${MCORE_UNPRIV_USER} ]]
    23    then
    24     x11runas=""
    25     sudo="sudo"
    26    else
    27     x11runas="x11runas"
    28     sudo=""
    29    fi
    30    
    31    RUN_IDESK=1
    32    case $1 in
    33     --no-startup|-n) RUN_IDESK=0 ;;
    34    esac
    35    
    36  # get the resolution  # get the resolution
    37  eval $(x11runas xinfo)  eval $(${x11runas} xinfo)
    38  xres="${xorg_width}"  xres="${xorg_width}"
    39  yres="${xorg_height}"  yres="${xorg_height}"
    40    
    # Line 37  yres="$(( ${yres} - 80 ))" Line 51  yres="$(( ${yres} - 80 ))"
    51  [ -d ${dest} ] && rm -rf ${dest}  [ -d ${dest} ] && rm -rf ${dest}
    52  [ -f ${rc} ] && rm -f ${rc}  [ -f ${rc} ] && rm -f ${rc}
    53  install -d ${dest}  install -d ${dest}
    54    if [ -f /usr/share/idesk/dot.ideskrc ]
    55    then
    56     install -m0644 /usr/share/idesk/dot.ideskrc "${rc}"
    57    fi
    58  chown "${MCORE_UNPRIV_USER}":"${MCORE_UNPRIV_GROUP}" ${dest}  chown "${MCORE_UNPRIV_USER}":"${MCORE_UNPRIV_GROUP}" ${dest}
    59    
    60  # clean default reboot,shutdown icon info  # clean default reboot,shutdown,sysinfo icon info
    61  for i in shutdown reboot  for i in shutdown reboot sysinfo
    62  do  do
    63   if [ -f ${MROOT}/${MCORE_CONFIG_PATH}/icons/info/${i}.${ICON_INFO_SUFFIX} ]   ${sudo} ${MCORE_LIBDIR}/idesk-generate-icon-info --del --name "${i}"
      then  
      rm ${MROOT}/${MCORE_CONFIG_PATH}/icons/info/${i}.${ICON_INFO_SUFFIX}  
      fi  
    64  done  done
    65    
    66  # default settings  # default settings
    # Line 104  do Line 119  do
    119   reboot) name="Neustarten"; cmd="${i}" ;;   reboot) name="Neustarten"; cmd="${i}" ;;
    120   esac   esac
    121    
    122   ${MCORE_LIBDIR}/idesk-generate-icon \   ${sudo} ${MCORE_LIBDIR}/idesk-generate-icon \
    123   --add \   --add \
    124   --name "${name}" \   --name "${name}" \
    125   --command "sudo /usr/sbin/${cmd}" \   --command "sudo /usr/sbin/${cmd}" \
    # Line 123  ${MCORE_LIBDIR}/idesk-sysinfo Line 138  ${MCORE_LIBDIR}/idesk-sysinfo
    138  ${MCORE_LIBDIR}/idesk-generate-icon --add \  ${MCORE_LIBDIR}/idesk-generate-icon --add \
    139   --resource "${MROOT}/${MCORE_CONFIG_PATH}/icons/info/sysinfo.${ICON_INFO_SUFFIX}"   --resource "${MROOT}/${MCORE_CONFIG_PATH}/icons/info/sysinfo.${ICON_INFO_SUFFIX}"
    140    
    141  # restart idesk  if [[ ${RUN_IDESK} = 1 ]]
     if [[ -n $(pidof idesk) ]]  
    142  then  then
    143   killall idesk; x11runas "nohup idesk > /dev/null &"   # restart idesk
    144     if [[ -n $(pidof idesk) ]]
    145     then
    146     killall idesk
    147     fi
    148     if [[ -z ${x11runas} ]]
    149     then
    150     nohup idesk > /dev/null &
    151     else
    152     ${x11runas} "nohup idesk > /dev/null &"
    153     fi
    154  fi  fi
    Legend:
    Removed from v.2411  
    changed lines
      Added in v.2415