getInfo 2.20.1

This commit is contained in:
kyodev 2017-10-29 03:54:14 +01:00
parent 53b045bc00
commit a89e1d8486
2 changed files with 6 additions and 6 deletions

View File

@ -1,6 +1,6 @@
#!/bin/bash
version=2.20.0
version=2.20.1
date="29/10/2017"
projet="simpledeb"
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
@ -1370,7 +1370,7 @@ figet_distrib(){ # 29/10/2017
[ "$fg_distrib" ] && [[ $(grep -is 'chrome-' /proc/version) || -f "/dev/cros_ec" ]] && fg_distrib="$(lsb_release -sd 2>/dev/null)/xhrome-os"
[ "$fg_distrib" ] && [ $(grep -is 'microsoft' /proc/version) ] && fg_distrib="$(lsb_release -sd 2>/dev/null)/windows"
[ "$fg_distrib" ] || fg_distrib=$(lsb_release -sd 2>/dev/null)
# complément sur fichier éventuels *[_-][version|release]
# prefix sur nom fichier éventuels *[_-][version|release]
[ "$prefix" ] || prefix=$(ls /etc/*_version 2>/dev/null | sed -En 's#/etc/(.*)_version#\1#p')
[ "$prefix" ] || prefix=$(ls /etc/*-version 2>/dev/null | sed -En 's#/etc/(.*)-version#\1#p')
[ "$prefix" ] || prefix=$(ls /etc/*-release 2>/dev/null | grep -v 'os-release' | sed -En 's#/etc/(.*)-release#\1#p')
@ -1379,11 +1379,11 @@ figet_distrib(){ # 29/10/2017
[ "$prefix" ] && prefix=${prefix^} # 1er caractère majuscule
# final
if [[ "$fg_distrib" && ! "$fg_distrib" =~ $prefix ]]; then # si fg_distrib et ne contient pas prefix
fg_distrib="$prefix - $fg_distrib $version"
fg_distrib="$prefix - $fg_distrib $(xargs <<< $version)"
elif [ -z "$fg_distrib" ] && [ "$prefix" ]; then # si fg_distrib vide et si prefix
fg_distrib="$prefix $version"
fg_distrib="$prefix $(xargs <<< $version)"
else
fg_distrib="$fg_distrib $version" # utilisation fg_distrib "normal"
fg_distrib="$fg_distrib$ $(xargs <<< $version)" # utilisation fg_distrib "normal"
fi
[ "$fg_distrib" ] || fg_distrib="${OS^} (indéterminé)"
}

View File

@ -12,7 +12,7 @@
---
## 2.20.0 29/10/2017
## 2.20.1 29/10/2017
* nouveau: figet_distrib
* suppression: figet_distro neofetch