From 7f96ace5bf88d582cd6ec8cf92682e01e98508fa Mon Sep 17 00:00:00 2001 From: inxi-svn Date: Thu, 20 Dec 2012 20:29:02 +0000 Subject: [PATCH] added some logging, again, nothing worth a version bump, but a new tarball anyway. --- inxi | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/inxi b/inxi index 2d6a1c5..2c83079 100755 --- a/inxi +++ b/inxi @@ -510,7 +510,8 @@ DISTROS_DERIVED="antix-version aptosid-version kanotix-version knoppix-version m DISTROS_EXCLUDE_LIST="debian_version ubuntu_version" DISTROS_PRIMARY="arch-release gentoo-release redhat-release slackware-version SuSE-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 with known problems # 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() { 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 shopt -s nullglob @@ -3616,6 +3617,9 @@ get_distro_data() a_distro_glob=(*[-_]{release,version}) cd "$OLDPWD" shopt -u nullglob + + temp_array=${a_distro_glob[@]} + log_function_data "A_GLX_DATA: $temp_array" if [[ ${#a_distro_glob[@]} -eq 1 ]];then distro_file="${a_distro_glob}"