dmitriy.kazimirov/inxi
1
0
Fork 0
mirror of https://github.com/smxi/inxi.git synced 2024-11-17 00:31:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

added some logging, again, nothing worth a version bump, but a new tarball anyway.

Browse source
This commit is contained in:
inxi-svn 2012-12-20 20:29:02 +00:00
parent 54f23fb3e8
commit 7f96ace5bf
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
inxi
View file

@ -510,7 +510,8 @@ DISTROS_DERIVED="antix-version aptosid-version kanotix-version knoppix-version m
DISTROS_EXCLUDE_LIST="debian_version ubuntu_version" DISTROS_EXCLUDE_LIST="debian_version ubuntu_version"
DISTROS_PRIMARY="arch-release gentoo-release redhat-release slackware-version SuSE-release" DISTROS_PRIMARY="arch-release gentoo-release redhat-release slackware-version SuSE-release"
DISTROS_LSB_GOOD="mandrake-release mandriva-release mandrakelinux-release" DISTROS_LSB_GOOD="mandrake-release mandriva-release mandrakelinux-release"
# almost no distros are using this normally, and derived distros are not using it at all as far as I can see so far # this is being used both by core distros and derived distros now, eg, solusos uses it for solusos id, while
# debian, solusos base, uses it as well, so we have to know which it is.
DISTROS_OS_RELEASE_GOOD="arch-release SuSE-release" DISTROS_OS_RELEASE_GOOD="arch-release SuSE-release"
## Distros with known problems ## Distros with known problems
# DSL (Bash 2.05b: grep -m doesn't work; arrays won't work) --> unusable output # DSL (Bash 2.05b: grep -m doesn't work; arrays won't work) --> unusable output
@ -3606,7 +3607,7 @@ get_display_manager()
get_distro_data() get_distro_data()
{ {
eval $LOGFS eval $LOGFS
local i='' j='' distro='' distro_file='' a_distro_glob='' local i='' j='' distro='' distro_file='' a_distro_glob='' temp_array=''
# get the wild carded array of release/version /etc files if present # get the wild carded array of release/version /etc files if present
shopt -s nullglob shopt -s nullglob
@ -3616,6 +3617,9 @@ get_distro_data()
a_distro_glob=(*[-_]{release,version}) a_distro_glob=(*[-_]{release,version})
cd "$OLDPWD" cd "$OLDPWD"
shopt -u nullglob shopt -u nullglob
temp_array=${a_distro_glob[@]}
log_function_data "A_GLX_DATA: $temp_array"
if [[ ${#a_distro_glob[@]} -eq 1 ]];then if [[ ${#a_distro_glob[@]} -eq 1 ]];then
distro_file="${a_distro_glob}" distro_file="${a_distro_glob}"