diff --git a/scripts/getInfo b/scripts/getInfo index 808a21f..0cd3611 100755 --- a/scripts/getInfo +++ b/scripts/getInfo @@ -1,7 +1,7 @@ #!/bin/bash -version=2.67.0 -date="16/12/2017" +version=2.68.0 +date="17/12/2017" projet="simpledeb" contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/" script="getInfo" @@ -2368,8 +2368,8 @@ fi_touchpad(){ # 14/12/2017 f_dspl_alrt "$info_driver" "info" } -fi_usb(){ # 15/12/2017 - local lsusb size lsusb_t ls lst ils motif result ls_p +fi_usb(){ # 17/12/2017 + local lsusb size lsusb_t ls lst ils motif result ls_p bus device id periph x_usb=1 lsusb=$( lsusb ) @@ -2377,22 +2377,21 @@ fi_usb(){ # 15/12/2017 lsusb=$( sort <<< "$lsusb" ) lsusb=$( f_lifting "$lsusb" ) # cosmétique # largeur max initiale de lsusb - size=$(( $( gawk '{ if ( length($0) > size ) size = length($0); } END {print size }' <<< $lsusb ) )) - size=$(( $size + 2 )) - lsusb_t=$( lsusb -t ) # formation index bus-device de lsub - # ls= 1-1 : Bus 001 Device 001: ID 1d6b:0002: Linux Foundation 2.0 root hub - ls=$( gawk ' BEGIN { FS=": " } + # 1-1 | 1d6b:0002 Linux Foundation 2.0 root hub + ls=$( gawk ' { - split($1,tab," ") - bus=sprintf("%d",tab[2]) - device=sprintf("%d",tab[4]) - objet=$2 - print bus "-" device " : " $1 " " objet + bus=sprintf("%d",$2) + device=sprintf("%d",$4) + id=sprintf("%s",$6) + $1=$2=$3=$4=$5=$6="" + sub(/^[[:blank:]]*/,"",$0) + periph=$0 + printf "%03d-%03d | %s %s\n",bus,device,id,periph } ' <<< $lsusb ) - ls=$( sed -E 's/(.*)( ID.*)/\1:\2/; s/(.* ID [[:alnum:]]{4}:[[:alnum:]]{4})(.*)/\1:\2/;' <<< $ls ) - # extraction Class Driver de lsusb -t et formation index bus-device - # 1-1 | ⇉ Class: root_hub Driver: ehci-pci/8p + # extraction Class Driver de lsusb -t et formation index bus-device + # 1-1 | root_hub ehci-pci/8p + lsusb_t=$( lsusb -t ) lst=$( gawk ' BEGIN {FS=", "} { @@ -2415,26 +2414,32 @@ fi_usb(){ # 15/12/2017 sub(/.*Driver=/,"",$3) driver=$3 } - printf( "%s-%s | ⇉ Class: %-14s Driver: %s\n",bus,device,class,driver ) + printf( "%03d-%03d | %-14s %s\n",bus,device,class,driver ) } ' <<< $lsusb_t ) - # assemblage et suppression index bus-device IFS=$'\n' + # calcul largeur max $ls + size=$(( 0 )) for ils in $ls; do - motif=${ils% :*} # extraction bus-device - result=$( grep -w -m1 "$motif" <<< "$lst" ) # extraction ligne correspondante dans lst - result=${result#* | } # suppression bus-device - ils=${ils#* : } # suppression bus-device - ls_p+=$( printf "%-"$size"s %s" $ils $result )$'\n' # assemblage + if [ ${#ils} -gt "$size" ]; then + size=$(( ${#ils} )) + fi + done + # assemblage et suppression index bus-device + for ils in $ls; do + motif=${ils% |*} # extraction bus-device + result=$( grep -w -m1 "$motif" <<< "$lst" ) # extraction ligne correspondante dans lst + result=${result#* | } # suppression bus-device + ls_p+=$( printf "%-"$size"s %s" $ils $result )$'\n' # assemblage done ls_p=${ls_p%[[:cntrl:]]} - # Bus 001 Device 001: ID 1d6b:0002: Linux Foundation 2.0 root hub ⇉ Class: root_hub Driver: ehci-pci/8p + ls_p=${ls_p//|} + ls_p=${ls_p//-/ } + ls_p=$( printf "%s %s %6s %28s %17s %17s" bus dev id périphérique class driver )"\n$ls_p" IFS="$IFS_INI" ### f_prnt tit2 "USB" - f_dspl cmd "$ls_p" "lsusb" "affichage modifié, ajout Class & Driver" - f_prnt l "$detail" - f_prnt l "$size" + f_dspl cmd "$ls_p" "lsusb + lsusb -t" "affichage modifié, ajout Class & Driver" f_prnt flush } @@ -4173,7 +4178,7 @@ prg_1(){ # début 2/12/2017 prg_2(){ # traitements principaux 1/12/2017 if [[ "$1" == all || "$1" =~ s ]]; then #systeme, matériel -cs echo -e "# ▷ Système" >> "$fileOutput" - for i in fi_system fi_cpu fi_mem fi_hw fi_batt fi_gpu fi_net fi_audio fi_bluez fi_usb fi_disk ; do + for i in fi_system fi_cpu fi_mem fi_hw fi_batt fi_gpu fi_net fi_audio fi_touchpad fi_bluez fi_usb fi_disk ; do echo -n "•" $i done diff --git a/scripts/getInfo_changelog.md b/scripts/getInfo_changelog.md index 9db9813..62e8df3 100644 --- a/scripts/getInfo_changelog.md +++ b/scripts/getInfo_changelog.md @@ -2,6 +2,10 @@ f__architecture +## getInfo 2.68.0 17/12/2017 + +* révision: affichage usb + ## getInfo 2.67.0 16/12/2017 * révision: affichage interface sortie ipv4 & ipv6