Magellan Linux

  • Back to homepage
    • /[mcore-svn]/mcore-src/trunk/mcore-tools/src/modules/idesk/idesk-sysinfo.in

    Diff of /mcore-src/trunk/mcore-tools/src/modules/idesk/idesk-sysinfo.in

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

    revision 2406 by niro, Mon Aug 31 09:00:31 2015 UTC revision 2825 by niro, Tue Aug 1 16:17:14 2017 UTC
    # Line 4  " Line 4  "
    4  source @@SYSCONFDIR@@/mcore/mcore.conf  source @@SYSCONFDIR@@/mcore/mcore.conf
    5  source ${MCORE_LIBDIR}/include/common.global.class  source ${MCORE_LIBDIR}/include/common.global.class
    6    
    7    if [[ $(whoami) = ${MCORE_UNPRIV_USER} ]]
    8    then
    9     x11runas=""
    10     sudo="sudo"
    11    else
    12     x11runas="x11runas"
    13     sudo=""
    14    fi
    15    
    16  # die if no display was found  # die if no display was found
    17  xinfo &> /dev/null || exit 1  ${x11runas} xinfo &> /dev/null || exit 1
    18    
    19  # eval xorg_width and xorg_height  # eval xorg_width and xorg_height
    20  eval $(x11runas xinfo)  xinfo=$(${x11runas} xinfo)
    21    if [[ $? = 0 ]]
    22    then
    23     eval ${xinfo}
    24    fi
    25    
    26  # fallback  # fallback
    27  [[ -z ${xorg_width} ]] && xorg_width="1024"  [[ -z ${xorg_width} ]] && xorg_width="1024"
    # Line 31  else Line 44  else
    44   serial="UNKNOWN"   serial="UNKNOWN"
    45  fi  fi
    46    
    47  ipaddr="$(iface_for_remote_addr $(dns_to_ip alx-control.dom-aka-nt.intern))"  iface="$(iface_for_remote_addr $(dns_to_ip alx-control.dom-aka-nt.intern))"
    48    ipaddr="$(get_iface_ip ${iface})"
    49  if [[ -z ${ipaddr} ]]  if [[ -z ${ipaddr} ]]
    50  then  then
    51   ipaddr="No network"   ipaddr="No network"
     else  
    52  fi  fi
    53    
    54  sysinfo="Hostname: $(hostname) Serial: #${serial} IP: ${ipaddr} OS: ${osversion} Kernel: $(uname -r)"  sysinfo="Hostname: $(hostname) Serial: #${serial} IP: ${ipaddr} OS: ${osversion} Kernel: $(uname -r)"
    # Line 52  xpos="$(( ${xorg_width} / 2 ))" Line 65  xpos="$(( ${xorg_width} / 2 ))"
    65  ypos="$(( ${xorg_height} - 22))"  ypos="$(( ${xorg_height} - 22))"
    66    
    67  # generate icon info  # generate icon info
    68  ${MCORE_LIBDIR}/idesk-generate-icon-info \  ${sudo} ${MCORE_LIBDIR}/idesk-generate-icon-info \
    69   --add \   --add \
    70   --name "sysinfo" \   --name "${sysinfo}" \
    71     --filename "sysinfo" \
    72   --command "exit 0" \   --command "exit 0" \
    73   --icon "sysinfo.png" \   --icon "sysinfo.png" \
    74   --xpos "${xpos}" \   --xpos "${xpos}" \
    Legend:
    Removed from v.2406  
    changed lines
      Added in v.2825