Merge branch 'develop'

* develop: code cleanup Uses better data source
robertpeteuil · Oct 17, 2017 · 127e339 · 127e339
2 parents fdfccfe + c6f3fba
commit 127e339
Showing 1 changed file with 34 additions and 32 deletions.
diff --git a/sysis b/sysis
@@ -11,8 +11,8 @@
 #
 
 scriptname="sysis"
-scriptbuildnum="3.4.11"
-scriptbuilddate="2017-09-07"
+scriptbuildnum="3.5.1"
+scriptbuilddate="2017-10-17"
 
 ############################################################
 ### VARS INITS
@@ -141,6 +141,7 @@ cleanCPUname() {
   tempCPUname=${tempCPUname/' CPU'/}        # remove ' CPU'
   tempCPUname=${tempCPUname/' Processor'/}  # remove ' Processor'
   tempCPUname=${tempCPUname%' @'*}          # remove speed
+  tempCPUname=${tempCPUname%'  '*}          # remove model #
   tempCPUname=$(cleanText "$tempCPUname")   # remove leading / trailine space
   echo -n "$tempCPUname"
 }
@@ -154,13 +155,10 @@ cleanVARtext() {
 }
 
 getNetwork() {
-  # Internet IP
-  pubIP=$(curl -s ipinfo.io/ip)
-  # LANIP via 'ip' if possible
-  if [[ $(ip -4 address 2> /dev/null) ]]; then
+  pubIP=$(curl -s ipinfo.io/ip)  # Internet IP
+  if [[ $(ip -4 address 2> /dev/null) ]]; then  # LANIP via 'ip' if possible
     lanIP=$(ip -4 address | awk '/brd/ {split($2, ip, /\//); print ip[1]}')
-  # else try 'ifconfig'
-  elif [[ $(ifconfig -a 2> /dev/null) ]]; then
+  elif [[ $(ifconfig -a 2> /dev/null) ]]; then  # else try 'ifconfig'
     case $OS in
      Linux)   # note RPI only has awk 1.x installed
         lanIP=$(ifconfig -a | awk '/(cast)/ {print $2}' | cut -d: -f2)
@@ -179,8 +177,7 @@ getNetwork() {
         ;;
     esac
   fi
-  # if multi LanIPs put in array
-  if [[ -n $lanIP ]]; then
+  if [[ -n $lanIP ]]; then  # if multi LanIPs put in array
     count=0
     for i in $lanIP; do
       lanIPS[count]=$i
@@ -203,34 +200,33 @@ getSystem() {
   if [[ $(dpkg --help 2> /dev/null) ]]; then
     PROCarch=$(dpkg --print-architecture)
   fi
-  if [[ $(lsb_release -h 2> /dev/null) ]]; then
-    LSBset="TRUE"
+  if [ -r /etc/os-release ]; then
+    VALUESvia="FILE"
+    LSBrel="$(. /etc/os-release && echo "$PRETTY_NAME")"
+    LSBcodename="$(. /etc/os-release && echo "$VERSION")"
+    LSBcodename=${LSBcodename#* (}
+    LSBcodename=${LSBcodename%)}
+  elif [[ $(lsb_release -h 2> /dev/null) ]]; then
+    VALUESvia="LSB"
     LSBidPRE=$(lsb_release -i 2> /dev/null)
-    LSBdescrPRE=$(lsb_release -d 2> /dev/null)
     LSBrelPRE=$(lsb_release -r 2> /dev/null)
     LSBcodenamePRE=$(lsb_release -c 2> /dev/null)
-    LSBallPRE=$(lsb_release -a 2> /dev/null)
   	[[ -n $LSBidPRE ]] && LSBid=${LSBidPRE#*":"} && LSBid=$(cleanText "$LSBid")
-  	[[ -n $LSBdescrPRE ]] && LSBdescr=${LSBdescrPRE#*":"} && LSBdescr=$(cleanText "$LSBdescr")
   	[[ -n $LSBrelPRE ]] && LSBrel=${LSBrelPRE#*":"} && LSBrel=$(cleanText "$LSBrel")
   	[[ -n $LSBcodenamePRE ]] && LSBcodename=${LSBcodenamePRE#*":"} && LSBcodename=$(cleanText "$LSBcodename")
-   	[[ -n $LSBallPRE ]] && LSBall=${LSBallPRE#*":"} && LSBall=$(cleanText "$LSBall")
   fi
   return 0
 }
 
 setLinuxCommon() {
-  if [[ $LSBset == "TRUE" ]]; then  # plan a - use vals from lsb_release
-    OSfullname="${LSBid} ${SYSkernal} ${LSBrel}"
+  if [[ $VALUESvia == "FILE" ]]; then   # plan a - use vals from file
+    OSfullname="${LSBrel}"
     OScodename="${LSBcodename}"
-  else                              # plan b - get vals from release doc
-    if [ -e "/etc/*release" ]; then
-      OSrelease=$(awk '/^VERSION_ID=/ {split($1, ary, /"/); print ary[2]}' /etc/*release)
-      OSfullname="$(awk '/^ID=/ { print toupper(substr($name,4,1)) tolower(substr($name,5))}' /etc/*release) ${SYSkernal} ${OSrelease}"
-      OScodename=$(awk '/^VERSION=/ {split($0, ary, /(\()||(\))/); print toupper(substr(ary[2],1,1)) tolower(substr(ary[2],2)) }' /etc/*release)
-    else                            # plan c - get OS name from uname
-      OSfullname="${SYSkernal}"
-    fi
+  elif [[ $VALUESvia == "LSB" ]]; then  # plan b - use vals from lsb_release
+    OSfullname="${LSBid} ${LSBrel}"
+    OScodename="${LSBcodename}"
+  else                                  # plan c - get OS name from uname
+    OSfullname="${SYSkernal}"
   fi
   if [ -e "/sys/devices/system/cpu/possible" ]; then
     DEVICEinfoExists=true
@@ -251,6 +247,7 @@ setLinuxCommon() {
 
 setRPI() {
   DeviceType="RPI"
+  OSdetails="KERNEL\t"
   setLinuxCommon
   if [ -e "/proc/cpuinfo" ]; then
     DEVICEinfoExists=true
@@ -306,8 +303,9 @@ setRPI() {
 
 setLinux() {
   DeviceType="Linux"
+  OSdetails="KERNEL\t"
   setLinuxCommon
-  OSversion=${SYSkernalVer%%"-"*}
+  OSversion=${SYSkernalVer%"-"*}
   HWdevice=""
   HWrelease=""
   if [ -e "/proc/cpuinfo" ]; then
@@ -325,6 +323,7 @@ setLinux() {
 
 setMac() {
   DeviceType="Mac"
+  OSdetails="OS VERSION"
   DEVICEinfoExists=true
   MacOSinitialVer=${SYSkernalVer%%.*}
   MacOSadjustedVer=$((MacOSinitialVer-4))
@@ -402,9 +401,12 @@ reportDebug() {
   echo -e "\t${CLRtitle}SYSkernalVer = \t${CLRwhite}${SYSkernalVer}"
   echo -e "\t${CLRtitle}SYSmachine = \t${CLRwhite}${SYSmachine}"
   echo -e "\t${CLRtitle}SYSplatform = \t${CLRwhite}${SYSplatform}\n"
-  if [[ "$LSBset" == "TRUE" ]]; then
+  if [[ "$VALUESvia" == "FILE" ]]; then
+    echo -e "\t${CLRheading}/ETC/OS-RELEASE${CLRwhite}"
+    echo -e "\t${CLRtitle}LSBrel = \t${CLRwhite}${LSBrel}"
+    echo -e "\t${CLRtitle}LSBcodename = \t${CLRwhite}${LSBcodename}${CLRnormal}\n"
+  elif [[ "$VALUESvia" == "LSB" ]]; then
     echo -e "\t${CLRheading}LSB_RELEASE${CLRwhite}"
-    echo -e "\t${CLRtitle}LSBdescr = \t${CLRwhite}${LSBdescr}"
     echo -e "\t${CLRtitle}LSBid = \t${CLRwhite}${LSBid}"
     echo -e "\t${CLRtitle}LSBrel = \t${CLRwhite}${LSBrel}"
     echo -e "\t${CLRtitle}LSBcodename = \t${CLRwhite}${LSBcodename}${CLRnormal}\n"
@@ -426,7 +428,7 @@ reportDebug() {
 }
 
 reportNetwork() {
-  printTitle
+  # printTitle
   echo -e "\t${CLRheading}HOST\t\t${CLRheading2}${MACHINE_NAME}"
   [[ -n $SYSnode ]] && [[ "$SYSnode" != "$HOSTNAME" ]] && echo -e "\t${CLRheading}NODE\t\t${CLRheading2}${SYSnode}"
   if [[ $lanIP != "Unknown" ]]; then
@@ -442,7 +444,7 @@ reportNetwork() {
 reportSystem() {
   echo -e "\t${CLRheading}OS\t\t${CLRheading2}${OSfullname}"
   [[ -n $OScodename ]] && echo -e "\t${CLRtitle}CODENAME\t${CLRwhite}${OScodename}"
-  [[ -n $OSversion ]] && echo -e "\t${CLRtitle}OS VERSION\t${CLRwhite}${OSversion}"
+  [[ -n $OSversion ]] && echo -e "\t${CLRtitle}${OSdetails}\t${CLRwhite}${OSversion}"
   if [ $DEVICEinfoExists ]; then
     echo -e "\n\t${CLRheading}DEVICE\t\t${CLRheading2}${HWdevice}"
     [[ -n $HWrelease ]] && echo -e "\t${CLRtitle}RELEASE DATE\t${CLRwhite}${HWrelease}"
@@ -451,7 +453,6 @@ reportSystem() {
     [[ -n $MEMusage ]] && echo -e "\t${CLRtitle}MEM USAGE\t${CLRwhite}${MEMusage}"
     [[ -n $DISKusage ]] && echo -e "\t${CLRtitle}DISK USAGE\t${CLRwhite}${DISKusage}$CLRnormal"
   fi
-  echo
   return 0
 }
 
@@ -464,6 +465,7 @@ reportMain() {
     [[ "$SYSplatform" != "unknown" ]] && HWdevice=${SYSplatform}
   fi
   reportSystem
+  echo
   return 0
 }