Magellan Linux

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 2412 by niro, Mon Aug 31 11:10:44 2015 UTC revision 2832 by niro, Wed Aug 30 13:54:01 2017 UTC
# Line 17  fi Line 17  fi
17  ${x11runas} 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 40  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} Arch: $(arch) Kernel: $(uname -r)"
55  #len_sysinfo="${#sysinfo}"  #len_sysinfo="${#sysinfo}"
56    
57  # calculate icon xpos  # calculate icon xpos
# Line 63  ypos="$(( ${xorg_height} - 22))" Line 67  ypos="$(( ${xorg_height} - 22))"
67  # generate icon info  # generate icon info
68  ${sudo} ${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.2412  
changed lines
  Added in v.2832