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

(change version)

Browse source 
found a bug, inxi is using gawk before the depends check, this creates bad output in ubuntu/mint unless it has gawk.

Fixed by moving tests to after dependency checks.
This commit is contained in:
inxi-svn 2009-11-18 01:54:28 +00:00
parent 182c622d46
commit 81365d855f
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
inxi
View file

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### version: 1.2.6 #### version: 1.2.7
#### Date: November 16 2009 #### Date: November 17 2009
######################################################################## ########################################################################
#### SPECIAL THANKS #### SPECIAL THANKS
######################################################################## ########################################################################
@ -386,6 +386,13 @@ main()
# Not all distro's have these depends installed by default # Not all distro's have these depends installed by default
check_script_depends check_script_depends
check_script_suggested_apps check_script_suggested_apps
# note: this needs to go AFTER depends check because these use gawk
# Do this after sourcing of config overrides so user can customize banwords
# Contrary to my previous belief, "${ARR[@]}" passes a quoted list, not one string
BAN_LIST_NORMAL=$( make_ban_lists "${A_NORMAL_BANS[@]}" )
BAN_LIST_CPU=$( make_ban_lists "${A_CPU_BANS[@]}" )
##echo "BAN_LIST_NORMAL='$BAN_LIST_NORMAL'"
# first init function must be set first for colors etc. Remember, no debugger # first init function must be set first for colors etc. Remember, no debugger
# stuff works on this function unless you set the debugging flag manually. # stuff works on this function unless you set the debugging flag manually.
@ -510,11 +517,6 @@ initialize_script_data()
##echo "PATH='$PATH'" ##echo "PATH='$PATH'"
##/bin/sh -c 'echo "PATH in subshell=\"$PATH\""' ##/bin/sh -c 'echo "PATH in subshell=\"$PATH\""'
# Do this after sourcing of config overrides so user can customize banwords
BAN_LIST_NORMAL=$( make_ban_lists "${A_NORMAL_BANS[@]}" ) # Contrary to my previous belief, "${ARR[@]}" passes a quoted list, not one string
BAN_LIST_CPU=$( make_ban_lists "${A_CPU_BANS[@]}" )
##echo "BAN_LIST_NORMAL='$BAN_LIST_NORMAL'"
# now set the script BOOLEANS for files required to run features # now set the script BOOLEANS for files required to run features
if [[ -d "/proc/" ]];then if [[ -d "/proc/" ]];then
B_PROC='true' B_PROC='true'